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
This commit is contained in:
Michael Vogt 2014-11-03 17:10:57 +01:00 committed by usd-importer
parent 79f342f1d0
commit 1e373302d7
2 changed files with 12 additions and 3 deletions

7
debian/changelog vendored
View File

@ -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 <michael.vogt@ubuntu.com> Mon, 03 Nov 2014 17:10:57 +0100
livecd-rootfs (2.264) vivid; urgency=low
* live-build/auto/config:

View File

@ -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