mirror of
https://git.launchpad.net/livecd-rootfs
synced 2025-05-19 14:51:49 +00:00
live-build/auto/config: Fix installation of ubuntu-server fstab removal
hook.
This commit is contained in:
parent
dc1ab10bb4
commit
1a62c181f0
2
debian/changelog
vendored
2
debian/changelog
vendored
@ -2,6 +2,8 @@ livecd-rootfs (2.76) UNRELEASED; urgency=low
|
|||||||
|
|
||||||
* live-build/auto/config: Don't try to install an empty task name when
|
* live-build/auto/config: Don't try to install an empty task name when
|
||||||
building an image without a live task.
|
building an image without a live task.
|
||||||
|
* live-build/auto/config: Fix installation of ubuntu-server fstab removal
|
||||||
|
hook.
|
||||||
|
|
||||||
-- Colin Watson <cjwatson@ubuntu.com> Thu, 23 Aug 2012 09:43:38 +0100
|
-- Colin Watson <cjwatson@ubuntu.com> Thu, 23 Aug 2012 09:43:38 +0100
|
||||||
|
|
||||||
|
@ -291,15 +291,6 @@ case $PROJECT in
|
|||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
case $PROJECT in
|
|
||||||
ubuntu-server)
|
|
||||||
cat > config/hooks/100-remove-fstab.chroot <<EOF
|
|
||||||
#! /bin/sh
|
|
||||||
rm -f /etc/fstab
|
|
||||||
EOF
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
case $SUBPROJECT in
|
case $SUBPROJECT in
|
||||||
wubi)
|
wubi)
|
||||||
add_binary_hook build-wubildr
|
add_binary_hook build-wubildr
|
||||||
@ -326,6 +317,15 @@ lb config noauto \
|
|||||||
echo "LB_CHROOT_HOOKS=\"$CHROOT_HOOKS\"" >> config/chroot
|
echo "LB_CHROOT_HOOKS=\"$CHROOT_HOOKS\"" >> config/chroot
|
||||||
echo "LB_BINARY_HOOKS=\"$BINARY_HOOKS\"" >> config/binary
|
echo "LB_BINARY_HOOKS=\"$BINARY_HOOKS\"" >> config/binary
|
||||||
|
|
||||||
|
case $PROJECT in
|
||||||
|
ubuntu-server)
|
||||||
|
cat > config/hooks/100-remove-fstab.chroot <<EOF
|
||||||
|
#! /bin/sh
|
||||||
|
rm -f /etc/fstab
|
||||||
|
EOF
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
|
||||||
if $BINARY_REMOVE_LINUX; then
|
if $BINARY_REMOVE_LINUX; then
|
||||||
cat > config/binary_rootfs/excludes << EOF
|
cat > config/binary_rootfs/excludes << EOF
|
||||||
boot/vmlinu?-*
|
boot/vmlinu?-*
|
||||||
|
Loading…
x
Reference in New Issue
Block a user