diff options
| author | Daniil Baturin <daniil@baturin.org> | 2019-06-30 20:25:03 +0200 |
|---|---|---|
| committer | Daniil Baturin <daniil@baturin.org> | 2019-06-30 20:25:03 +0200 |
| commit | cb83db1758822dbd16fa712aa6aab7005d51b154 (patch) | |
| tree | 565026f8c2ed14f26f9a4bfda59f2aba1b462faf /scripts | |
| parent | 842f2974d483bb37fc32b5766cb4edb5f21ec2fe (diff) | |
| parent | 444975cec833fd6788c89e4ce47475cce948cf87 (diff) | |
| download | vyatta-cfg-system-cb83db1758822dbd16fa712aa6aab7005d51b154.tar.gz vyatta-cfg-system-cb83db1758822dbd16fa712aa6aab7005d51b154.zip | |
Merge branch 'current' of https://github.com/vyos/vyatta-cfg-system into current
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/install/install-get-partition | 6 | ||||
| -rwxr-xr-x | scripts/install/install-postinst-new | 6 | ||||
| -rwxr-xr-x | scripts/vyatta-grub-setup | 6 |
3 files changed, 14 insertions, 4 deletions
diff --git a/scripts/install/install-get-partition b/scripts/install/install-get-partition index b3f2741e..560125c2 100755 --- a/scripts/install/install-get-partition +++ b/scripts/install/install-get-partition @@ -302,12 +302,16 @@ check_for_new_raid () { echo "Creating RAID-1 group on partitions: /dev/${drive1}${data_dev} /dev/${drive2}${data_dev}" raid_dev=md0 - mdadm --create /dev/$raid_dev --level=1 --raid-disks=2 --metadata=0.90 \ + yes|mdadm --create /dev/$raid_dev --level=1 --raid-disks=2 --metadata=0.90 \ /dev/${drive1}${data_dev} /dev/${drive2}${data_dev} if [ $? = 0 -a -e /dev/$raid_dev ]; then echo "RAID-1 group created successfully:" cat /proc/mdstat | grep --after-context 2 ^$raid_dev | sed -e 's/^/\t/' + if [ -e /usr/sbin/update-initramfs.orig.initramfs-tools ]; then + echo "Updating initramfs to include the raid config:" + /usr/sbin/update-initramfs.orig.initramfs-tools -u + fi else echo "Unable to create RAID-1 group!" return diff --git a/scripts/install/install-postinst-new b/scripts/install/install-postinst-new index ae723627..85eba45f 100755 --- a/scripts/install/install-postinst-new +++ b/scripts/install/install-postinst-new @@ -263,8 +263,10 @@ fi # Install grub install_grub -# Perform additional configuration if installing on Xen -check_for_xen_extras +if [ ! -d /sys/firmware/efi ]; then + # Perform additional configuration if installing on Xen + check_for_xen_extras +fi # # Only start the mdadm daemon if we have the root filesystem running diff --git a/scripts/vyatta-grub-setup b/scripts/vyatta-grub-setup index 236b41ea..de67ba60 100755 --- a/scripts/vyatta-grub-setup +++ b/scripts/vyatta-grub-setup @@ -163,7 +163,11 @@ fi fi if [ ${ROOT_PARTITION:0:2} = "md" ]; then - uuid_root_disk=`/sbin/tune2fs -l /dev/${root_disk}1 | grep UUID | awk '{print $3}'` + if [ -d /sys/firmware/efi ]; then + uuid_root_disk=`/sbin/tune2fs -l /dev/${root_disk}3 | grep UUID | awk '{print $3}'` + else + uuid_root_disk=`/sbin/tune2fs -l /dev/${root_disk}1 | grep UUID | awk '{print $3}'` + fi uuid_root_md=`/sbin/tune2fs -l /dev/md${ROOT_PARTITION#md} | grep UUID | awk '{print $3}'` echo "" echo -e "insmod part_msdos" |