diff options
author | Daniel Baumann <mail@daniel-baumann.ch> | 2013-05-06 14:48:46 +0200 |
---|---|---|
committer | Daniel Baumann <mail@daniel-baumann.ch> | 2013-05-06 14:48:46 +0200 |
commit | d1047e809a90daa0e88329efc0db21931be0b919 (patch) | |
tree | 5dc92aaaeb4d15dcad4796935b90a9675be93ad5 /scripts/build/chroot_sysv-rc | |
parent | 160d6bade79bf58a1c0d1842dc9b55ec178ec303 (diff) | |
download | vyos-live-build-d1047e809a90daa0e88329efc0db21931be0b919.tar.gz vyos-live-build-d1047e809a90daa0e88329efc0db21931be0b919.zip |
Adding debian version 4.0~a1-1.debian/4.0_a1-1
Diffstat (limited to 'scripts/build/chroot_sysv-rc')
-rwxr-xr-x | scripts/build/chroot_sysv-rc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/scripts/build/chroot_sysv-rc b/scripts/build/chroot_sysv-rc index 685775989..4e1fc160e 100755 --- a/scripts/build/chroot_sysv-rc +++ b/scripts/build/chroot_sysv-rc @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org> +## Copyright (C) 2006-2012 Daniel Baumann <daniel@debian.org> ## ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it @@ -40,10 +40,10 @@ case "${1}" in # Creating lock file Create_lockfile .lock - if [ -e chroot/usr/sbin/policy-rc.d ] + if [ -f chroot/usr/sbin/policy-rc.d ] then # Save policy-rc.d file - Chroot chroot dpkg-divert --rename --quiet --add /usr/sbin/policy-rc.d + mv chroot/usr/sbin/policy-rc.d chroot/usr/sbin/policy-rc.d.orig fi # Create policy-rc.d file @@ -68,13 +68,13 @@ EOF # Creating lock file Create_lockfile .lock - # Remove custom policy-rc.d file - rm -f chroot/usr/sbin/policy-rc.d - - if [ -e chroot/usr/sbin/policy-rc.d.distrib ] + if [ -f chroot/usr/sbin/policy-rc.d.orig ] then # Restore policy-rc.d file - Chroot chroot dpkg-divert --rename --quiet --remove /usr/sbin/policy-rc.d + mv chroot/usr/sbin/policy-rc.d.orig chroot/usr/sbin/policy-rc.d + else + # Remove policy-rc.d file + rm -f chroot/usr/sbin/policy-rc.d fi # Removing stage file |