diff options
| -rw-r--r-- | debian/changelog | 9 | ||||
| -rwxr-xr-x | src/main.sh | 6 | ||||
| -rw-r--r-- | src/scripts/02defaults.sh | 11 | ||||
| -rw-r--r-- | src/scripts/14chroot.sh | 3 |
4 files changed, 14 insertions, 15 deletions
diff --git a/debian/changelog b/debian/changelog index cb54005..8350ce3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +live-package (0.99.14-4) testing; urgency=medium + + * 02defaults.sh: Updated kernel flavours to match etch. + * 14chroot.sh: Removed xorg hack, not needed in etch. + * 14chroot.sh: Fixed misspelling of aptitude. + * main.sh: Updated release codenames to match etch. + + -- Daniel Baumann <daniel@debian.org> Thu, 8 Mar 2007 10:55:00 +0100 + live-package (0.99.14-3) unstable; urgency=high * Adding workaround for new xorg packages by including xserver-xorg-input-all diff --git a/src/main.sh b/src/main.sh index cfffd83..7b3171f 100755 --- a/src/main.sh +++ b/src/main.sh @@ -30,9 +30,9 @@ CONFIG="/etc/make-live.conf" PROGRAM="`basename ${0}`" VERSION="0.99.14" -CODENAME_OLDSTABLE="woody" -CODENAME_STABLE="sarge" -CODENAME_TESTING="etch" +CODENAME_OLDSTABLE="sarge" +CODENAME_STABLE="etch" +CODENAME_TESTING="lenny" CODENAME_UNSTABLE="sid" # Source sub scripts diff --git a/src/scripts/02defaults.sh b/src/scripts/02defaults.sh index 410332c..9cc4c5a 100644 --- a/src/scripts/02defaults.sh +++ b/src/scripts/02defaults.sh @@ -86,13 +86,7 @@ Defaults () ;; amd64) - if [ "${LIVE_DISTRIBUTION}" = "unstable" ] || [ "${LIVE_DISTRIBUTION}" = "${CODENAME_UNSTABLE}" ] || \ - [ "${LIVE_DISTRIBUTION}" = "testing" ] || [ "${LIVE_DISTRIBUTION}" = "${CODENAME_TESTING}" ] - then - LIVE_KERNEL="amd64" - else - LIVE_KERNEL="amd64-generic" - fi + LIVE_KERNEL="amd64" ;; arm) @@ -105,8 +99,7 @@ Defaults () ;; i386) - if [ "${LIVE_DISTRIBUTION}" = "oldstable" ] || [ "${LIVE_DISTRIBUTION}" = "${CODENAME_OLDSTABLE}" ] || \ - [ "${LIVE_DISTRIBUTION}" = "stable" ] || [ "${LIVE_DISTRIBUTION}" = "${CODENAME_STABLE}" ] + if [ "${LIVE_DISTRIBUTION}" = "oldstable" ] || [ "${LIVE_DISTRIBUTION}" = "${CODENAME_OLDSTABLE}" ] then LIVE_KERNEL="386" else diff --git a/src/scripts/14chroot.sh b/src/scripts/14chroot.sh index 2e2b489..cc24eec 100644 --- a/src/scripts/14chroot.sh +++ b/src/scripts/14chroot.sh @@ -156,9 +156,6 @@ Chroot () Chroot_exec "${LIVE_HOOK}" fi - # Temporary hacks for broken packages - Hack_xorg - # Add filesystem.manifest Chroot_exec "dpkg-query -W \*" | awk '$2 ~ /./ {print $1 " " $2 }' > "${LIVE_ROOT}"/filesystem.manifest |