diff options
| author | Kim Hagen <kim.sidney@gmail.com> | 2016-02-05 11:36:41 -0500 |
|---|---|---|
| committer | Kim Hagen <kim.sidney@gmail.com> | 2016-02-05 11:36:41 -0500 |
| commit | 0d7e6ac3ff336bee96c2a235ae442cb1c8099735 (patch) | |
| tree | 04dd9864880d500eb69b1049193883496f68497c /scripts | |
| parent | f54bad96cef6ed52547151bc3a7ef64377f16c3e (diff) | |
| download | vyatta-cfg-system-0d7e6ac3ff336bee96c2a235ae442cb1c8099735.tar.gz vyatta-cfg-system-0d7e6ac3ff336bee96c2a235ae442cb1c8099735.zip | |
Renamed vyatta-union to vyos-union.
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/install/install-postinst-new | 2 | ||||
| -rwxr-xr-x | scripts/vyatta-grub-setup | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/scripts/install/install-postinst-new b/scripts/install/install-postinst-new index 589a04a8..2a3bcde9 100755 --- a/scripts/install/install-postinst-new +++ b/scripts/install/install-postinst-new @@ -175,7 +175,7 @@ setup_xen_extras () { echo "" >> $grubfile echo "title vyatta-virt" >> $grubfile echo "root (hd0,0)" >> $grubfile - echo "kernel $xen_grub_boot_path/vmlinuz root=/dev/$rootdev boot=live vyatta-union=$xen_grub_boot_path console=hvc0" >> $grubfile + echo "kernel $xen_grub_boot_path/vmlinuz root=/dev/$rootdev boot=live vyos-union=$xen_grub_boot_path console=hvc0" >> $grubfile echo "initrd $xen_grub_boot_path/initrd.img" >> $grubfile # Add symlink pointing to default image diff --git a/scripts/vyatta-grub-setup b/scripts/vyatta-grub-setup index 11e73846..63e3d987 100755 --- a/scripts/vyatta-grub-setup +++ b/scripts/vyatta-grub-setup @@ -103,7 +103,7 @@ else fi if eval "$UNION"; then - GRUB_OPTIONS="boot=live quiet vyatta-union=/boot/$livedir" + GRUB_OPTIONS="boot=live quiet vyos-union=/boot/$livedir" union_xen_kernel_version=$(ls $ROOTFSDIR/boot/$livedir/vmlinuz*-xen* \ 2>/dev/null \ | awk -F/ '{ print $6 }' \ |