diff options
| author | Daniel Baumann <daniel@debian.org> | 2007-09-23 10:04:46 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2007-09-23 10:04:46 +0200 |
| commit | f6a05f356e7d5cf929187c69491ca6041007a3c3 (patch) | |
| tree | 5ab003498be8ad81fc1b7e4ba116be9c9ca5298b | |
| parent | 2b43599e4674970f342d14454ac330f80063733d (diff) | |
| download | vyos-live-build-f6a05f356e7d5cf929187c69491ca6041007a3c3.tar.gz vyos-live-build-f6a05f356e7d5cf929187c69491ca6041007a3c3.zip | |
Adding live-helper 1.0~a1-2.
| -rw-r--r-- | debian/changelog | 8 | ||||
| -rw-r--r-- | doc/ChangeLog | 11 | ||||
| -rwxr-xr-x | functions/defaults.sh | 11 | ||||
| -rwxr-xr-x | helpers/lh_chroot_sysvinit | 2 |
4 files changed, 25 insertions, 7 deletions
diff --git a/debian/changelog b/debian/changelog index 053e68a5e..c48d85e5b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +live-helper (1.0~a1-2) unstable; urgency=low + + * functions/defaults.sh: Fixed setting of LIVE_SYSVINIT. + * helpers/lh_chroot_sysvinit: Changed check for LIVE_SYSVINIT from disabled to + enabled. + + -- Daniel Baumann <daniel@debian.org> Mon, 12 Mar 2007 18:00:00 +0100 + live-helper (1.0~a1-1) unstable; urgency=low * Initial release, replacing live-package. diff --git a/doc/ChangeLog b/doc/ChangeLog index fff62793b..ad0c98423 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,4 +1,11 @@ +2007-03-14 Daniel Baumann <daniel@debian.org> + + * functions/defaults.sh: Fixed setting of LIVE_SYSVINIT. + * helpers/lh_chroot_sysvinit: Changed check for LIVE_SYSVINIT from disabled to + enabled. + * Uploaded 1.0~a1-2. + 2007-03-12 Daniel Baumann <daniel@debian.org> - * Rewritten live-package. - * Uploaded 1.0~a1-1. + * Rewritten live-package. + * Uploaded 1.0~a1-1. diff --git a/functions/defaults.sh b/functions/defaults.sh index 462c1ebc4..9463ad66a 100755 --- a/functions/defaults.sh +++ b/functions/defaults.sh @@ -287,11 +287,14 @@ Set_defaults () fi # Setting sysvinit option - if [ -z "${LIVE_SYSVINIT}" ] && [ "${LIVE_FLAVOUR}" != "mini" ] + if [ -z "${LIVE_SYSVINIT}" ] then - LIVE_SYSVINIT="enabled" - else - LIVE_SYSVINIT="disabled" + if [ "${LIVE_FLAVOUR}" = "mini" ] + then + LIVE_SYSVINIT="enabled" + else + LIVE_SYSVINIT="disabled" + fi fi ## config/image diff --git a/helpers/lh_chroot_sysvinit b/helpers/lh_chroot_sysvinit index e4746d6ee..933da573e 100755 --- a/helpers/lh_chroot_sysvinit +++ b/helpers/lh_chroot_sysvinit @@ -27,7 +27,7 @@ Create_lockfile "${LIVE_ROOT}"/.lock # Checking stage file Check_stagefile "${LIVE_ROOT}"/.stage/chroot_sysvinit -if [ "${LIVE_SYSVINIT}" = "disabled" ] +if [ "${LIVE_SYSVINIT}" = "enabled" ] then # Disable all for FILE in "${LIVE_CHROOT}"/etc/init.d/* |