boxtec-support
/
netinstall
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mk_mmc.sh: use deb_distribution define

Browse Source 
Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
pull/37/head
Robert Nelson 11 years ago
parent ed2a57978c
commit 2b1a2a8209
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File

12
mk_mmc.sh
Unescape View File

@ -950,7 +950,7 @@ initrd_preseed_settings () {
cd ${TEMPDIR}/initrd-tree/ cd ${TEMPDIR}/initrd-tree/
case "${DIST}" in case "${DIST}" in
trusty) trusty)
cp -v "${DIR}/lib/ubuntu-finish.sh" ${TEMPDIR}/initrd-tree/usr/bin/finish-install.sh cp -v "${DIR}/lib/${deb_distribution}-finish.sh" ${TEMPDIR}/initrd-tree/usr/bin/finish-install.sh
cp -v "${DIR}/lib/flash_kernel/flash-kernel.conf" ${TEMPDIR}/initrd-tree/etc/flash-kernel.conf cp -v "${DIR}/lib/flash_kernel/flash-kernel.conf" ${TEMPDIR}/initrd-tree/etc/flash-kernel.conf
cp -v "${DIR}/lib/flash_kernel/all.db" ${TEMPDIR}/initrd-tree/etc/all.db cp -v "${DIR}/lib/flash_kernel/all.db" ${TEMPDIR}/initrd-tree/etc/all.db
flash_kernel_base_installer flash_kernel_base_installer
@ -959,15 +959,15 @@ initrd_preseed_settings () {
patch_flash_kernel_db patch_flash_kernel_db
;; ;;
utopic) utopic)
cp -v "${DIR}/lib/ubuntu-finish.sh" ${TEMPDIR}/initrd-tree/usr/bin/finish-install.sh cp -v "${DIR}/lib/${deb_distribution}-finish.sh" ${TEMPDIR}/initrd-tree/usr/bin/finish-install.sh
cp -v "${DIR}/lib/flash_kernel/all.db" ${TEMPDIR}/initrd-tree/etc/all.db cp -v "${DIR}/lib/flash_kernel/all.db" ${TEMPDIR}/initrd-tree/etc/all.db
neuter_flash_kernel neuter_flash_kernel
;; ;;
wheezy) wheezy)
cp -v "${DIR}/lib/debian-finish.sh" ${TEMPDIR}/initrd-tree/usr/bin/finish-install.sh cp -v "${DIR}/lib/${deb_distribution}-finish.sh" ${TEMPDIR}/initrd-tree/usr/bin/finish-install.sh
;; ;;
jessie) jessie)
cp -v "${DIR}/lib/debian-finish.sh" ${TEMPDIR}/initrd-tree/usr/bin/finish-install.sh cp -v "${DIR}/lib/${deb_distribution}-finish.sh" ${TEMPDIR}/initrd-tree/usr/bin/finish-install.sh
cp -v "${DIR}/lib/flash_kernel/all.db" ${TEMPDIR}/initrd-tree/etc/all.db cp -v "${DIR}/lib/flash_kernel/all.db" ${TEMPDIR}/initrd-tree/etc/all.db
neuter_flash_kernel neuter_flash_kernel
;; ;;
@ -1569,15 +1569,19 @@ check_distro () {
case "${DISTRO_TYPE}" in case "${DISTRO_TYPE}" in
trusty|trusty-armhf) trusty|trusty-armhf)
DIST="trusty" DIST="trusty"
deb_distribution="ubuntu"
;; ;;
utopic|utopic-armhf) utopic|utopic-armhf)
DIST="utopic" DIST="utopic"
deb_distribution="ubuntu"
;; ;;
wheezy|wheezy-armhf) wheezy|wheezy-armhf)
DIST="wheezy" DIST="wheezy"
deb_distribution="debian"
;; ;;
jessie|jessie-armhf) jessie|jessie-armhf)
DIST="jessie" DIST="jessie"
deb_distribution="debian"
;; ;;
*) *)
IN_VALID_DISTRO=1 IN_VALID_DISTRO=1

Write Preview
Loading…
Cancel
Save