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

Imported using git-ubuntu import.

Changelog parent: 81269b7a62

New changelog entries:
  * ubuntu-core: Fix build failure due to missing /etc/default/grub and
    provide an fstab that will make systemd happy.
impish
Stéphane Graber 11 years ago committed by usd-importer
parent 81269b7a62
commit 4b23d3370b

7
debian/changelog vendored

@ -1,3 +1,10 @@
livecd-rootfs (2.238) utopic; urgency=medium
* ubuntu-core: Fix build failure due to missing /etc/default/grub and
provide an fstab that will make systemd happy.
-- Stéphane Graber <stgraber@ubuntu.com> Tue, 05 Aug 2014 11:32:44 -0400
livecd-rootfs (2.237) utopic; urgency=medium livecd-rootfs (2.237) utopic; urgency=medium
* ubuntu-core: Add click-systemd to preinstalled image (currently only in * ubuntu-core: Add click-systemd to preinstalled image (currently only in

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

@ -0,0 +1,6 @@
#!/bin/sh -x
cat >>/etc/fstab<<EOT
# Minimal setup required for systemd to provide a r/w FS
/dev/root / rootfs defaults 0 0
EOT
Loading…
Cancel
Save