Import patches-unapplied version 2.236 to ubuntu/utopic-proposed

Imported using git-ubuntu import.

Changelog parent: 61e05b928da0570f1dd7eadff817719c1d36b89c

New changelog entries:
  [ James Hunt ]
  * ubuntu-core:
    - Perform in-place edit.
    - Allow variable expansion.
This commit is contained in:
Colin Watson 2014-08-05 10:52:55 +02:00 committed by usd-importer
parent 61e05b928d
commit c802879846
2 changed files with 11 additions and 2 deletions

9
debian/changelog vendored
View File

@ -1,3 +1,12 @@
livecd-rootfs (2.236) utopic; urgency=medium
[ James Hunt ]
* ubuntu-core:
- Perform in-place edit.
- Allow variable expansion.
-- Colin Watson <cjwatson@ubuntu.com> Tue, 05 Aug 2014 10:52:55 +0200
livecd-rootfs (2.235) utopic; urgency=medium
* Only add the ubuntu-core hooks for the system-image subproject.

View File

@ -3,7 +3,7 @@
# Boot using systemd and disable quiet boot
# to see what is happening.
systemd=/lib/systemd/systemd
sed \
-e 's,^\([ ]*GRUB_CMDLINE_LINUX\)=""$,\1="init=$systemd",g' \
sed -i \
-e "s,^\\([ ]*GRUB_CMDLINE_LINUX\\)=\"\"$,\\1=\"init=$systemd\",g" \
-e 's,^\([ ]*GRUB_CMDLINE_LINUX_DEFAULT\)="quiet splash",\1="",g' \
/etc/default/grub