From 1e373302d740969a0f83ddc2e1765137cf20c6f4 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 3 Nov 2014 17:10:57 +0100 Subject: [PATCH] Import patches-unapplied version 2.265 to ubuntu/vivid-proposed Imported using git-ubuntu import. Changelog parent: 79f342f1d0a273ca792c1307907435c6450090c9 New changelog entries: * live-build/ubuntu-core/hooks/03-boot_with_systemd.chroot: - only modify /etc/default/grub if the file exists --- debian/changelog | 7 +++++++ live-build/ubuntu-core/hooks/03-boot_with_systemd.chroot | 8 +++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 0875fa04..87742dfc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (2.265) vivid; urgency=low + + * live-build/ubuntu-core/hooks/03-boot_with_systemd.chroot: + - only modify /etc/default/grub if the file exists + + -- Michael Vogt Mon, 03 Nov 2014 17:10:57 +0100 + livecd-rootfs (2.264) vivid; urgency=low * live-build/auto/config: diff --git a/live-build/ubuntu-core/hooks/03-boot_with_systemd.chroot b/live-build/ubuntu-core/hooks/03-boot_with_systemd.chroot index 9c5e4a8c..f19164f0 100755 --- a/live-build/ubuntu-core/hooks/03-boot_with_systemd.chroot +++ b/live-build/ubuntu-core/hooks/03-boot_with_systemd.chroot @@ -3,7 +3,9 @@ # Boot using systemd and disable quiet boot # to see what is happening. systemd=/lib/systemd/systemd -[ -f /etc/default/grub ] && sed -i \ - -e "s,^\\([ ]*GRUB_CMDLINE_LINUX\\)=\"\"$,\\1=\"init=$systemd\",g" \ - -e 's,^\([ ]*GRUB_CMDLINE_LINUX_DEFAULT\)="quiet splash",\1="",g' \ +if [ -f /etc/default/grub ]; then + sed -i \ + -e "s,^\\([ ]*GRUB_CMDLINE_LINUX\\)=\"\"$,\\1=\"init=$systemd\",g" \ + -e 's,^\([ ]*GRUB_CMDLINE_LINUX_DEFAULT\)="quiet splash",\1="",g' \ /etc/default/grub +fi