From b955349c15fa9c8f80694016c2a1bc3cd7995ce0 Mon Sep 17 00:00:00 2001 From: Robert Nelson Date: Sun, 27 Jul 2014 18:32:51 -0500 Subject: [PATCH] flash-kernel: with flash-kernel under control, we dont need parted nor do we need to fix the partition Signed-off-by: Robert Nelson --- lib/debian-finish.sh | 7 ------- lib/jessie-preseed.cfg | 2 +- lib/trusty-preseed.cfg | 2 +- lib/ubuntu-finish.sh | 7 ------- lib/utopic-preseed.cfg | 2 +- lib/wheezy-preseed.cfg | 2 +- 6 files changed, 4 insertions(+), 18 deletions(-) diff --git a/lib/debian-finish.sh b/lib/debian-finish.sh index 6bb93a3..6354726 100644 --- a/lib/debian-finish.sh +++ b/lib/debian-finish.sh @@ -28,13 +28,6 @@ ls -lh /boot/uboot/* >/boot/uboot/backup/file_list.log echo "fdisk -l..." >> /var/log/netinstall.log fdisk -l >> /var/log/netinstall.log -#Set boot flag on: /dev/mmcblk0: -if [ -f /sbin/parted ] ; then - /sbin/parted ${bootdrive} set 1 boot on || true -else - echo "ERROR: [/sbin/parted ${bootdrive} set 1 boot on] failed" >> /var/log/netinstall.log -fi - #Find Target Partition and FileSystem if [ -f /boot/uboot/mounts ] ; then echo "cat /boot/uboot/mounts..." >> /var/log/netinstall.log diff --git a/lib/jessie-preseed.cfg b/lib/jessie-preseed.cfg index 8d7c004..351d0bd 100644 --- a/lib/jessie-preseed.cfg +++ b/lib/jessie-preseed.cfg @@ -58,7 +58,7 @@ d-i partman-auto/disk string /dev/mmcblk0 d-i partman-auto/expert_recipe_file string /partition_recipe # Individual additional packages to install -d-i pkgsel/include string bash initramfs-tools ntpdate parted util-linux u-boot-tools wget +d-i pkgsel/include string bash initramfs-tools ntpdate util-linux u-boot-tools wget # Whether to upgrade packages after debootstrap. # Allowed values: none, safe-upgrade, full-upgrade diff --git a/lib/trusty-preseed.cfg b/lib/trusty-preseed.cfg index caa129a..b40b35f 100644 --- a/lib/trusty-preseed.cfg +++ b/lib/trusty-preseed.cfg @@ -62,7 +62,7 @@ d-i partman-auto/disk string /dev/mmcblk0 d-i partman-auto/expert_recipe_file string /partition_recipe # Individual additional packages to install -d-i pkgsel/include string bash initramfs-tools ntpdate parted util-linux u-boot-tools wget +d-i pkgsel/include string bash initramfs-tools ntpdate util-linux u-boot-tools wget # Whether to upgrade packages after debootstrap. # Allowed values: none, safe-upgrade, full-upgrade diff --git a/lib/ubuntu-finish.sh b/lib/ubuntu-finish.sh index adb0dda..b78e5c8 100644 --- a/lib/ubuntu-finish.sh +++ b/lib/ubuntu-finish.sh @@ -28,13 +28,6 @@ ls -lh /boot/uboot/* >/boot/uboot/backup/file_list.log echo "fdisk -l..." >> /var/log/netinstall.log fdisk -l >> /var/log/netinstall.log -#Set boot flag on: /dev/mmcblk0: -if [ -f /sbin/parted ] ; then - /sbin/parted ${bootdrive} set 1 boot on || true -else - echo "ERROR: [/sbin/parted ${bootdrive} set 1 boot on] failed" >> /var/log/netinstall.log -fi - #Find Target Partition and FileSystem if [ -f /boot/uboot/mounts ] ; then echo "cat /boot/uboot/mounts..." >> /var/log/netinstall.log diff --git a/lib/utopic-preseed.cfg b/lib/utopic-preseed.cfg index 0421814..8d7ad30 100644 --- a/lib/utopic-preseed.cfg +++ b/lib/utopic-preseed.cfg @@ -62,7 +62,7 @@ d-i partman-auto/disk string /dev/mmcblk0 d-i partman-auto/expert_recipe_file string /partition_recipe # Individual additional packages to install -d-i pkgsel/include string bash initramfs-tools ntpdate parted util-linux u-boot-tools wget +d-i pkgsel/include string bash initramfs-tools ntpdate util-linux u-boot-tools wget # Whether to upgrade packages after debootstrap. # Allowed values: none, safe-upgrade, full-upgrade diff --git a/lib/wheezy-preseed.cfg b/lib/wheezy-preseed.cfg index a9545ec..75ee4ae 100644 --- a/lib/wheezy-preseed.cfg +++ b/lib/wheezy-preseed.cfg @@ -55,7 +55,7 @@ d-i partman-auto/disk string /dev/mmcblk0 d-i partman-auto/expert_recipe_file string /partition_recipe # Individual additional packages to install -d-i pkgsel/include string bash initramfs-tools ntpdate parted util-linux u-boot-tools wget +d-i pkgsel/include string bash initramfs-tools ntpdate util-linux u-boot-tools wget # Whether to upgrade packages after debootstrap. # Allowed values: none, safe-upgrade, full-upgrade