diff options
Diffstat (limited to 'src/scripts')
| -rw-r--r-- | src/scripts/02defaults.sh | 19 | ||||
| -rw-r--r-- | src/scripts/13hack.sh | 3 | ||||
| -rw-r--r-- | src/scripts/21image.sh | 4 | ||||
| -rw-r--r-- | src/scripts/22iso.sh | 5 | ||||
| -rw-r--r-- | src/scripts/23net.sh | 6 |
5 files changed, 22 insertions, 15 deletions
diff --git a/src/scripts/02defaults.sh b/src/scripts/02defaults.sh index 6e54c137b..fd58883ee 100644 --- a/src/scripts/02defaults.sh +++ b/src/scripts/02defaults.sh @@ -107,7 +107,7 @@ Defaults () ;; amd64) - if [ "${LIVE_DISTRIBUTION}" = "unstable" ] + if [ "${LIVE_DISTRIBUTION}" = "unstable" ] || [ "${LIVE_DISTRIBUTION}" = "testing" ] then LIVE_KERNEL="amd64" else @@ -176,19 +176,22 @@ Defaults () # Check for package lists if [ -z "${LIVE_PACKAGE_LIST}" ] then - LIVE_PACKAGE_LIST="${BASE}/lists/standard" - else if [ "${LIVE_FLAVOUR}" = "minimal" ] then LIVE_PACKAGE_LIST="${BASE}/lists/minimal" - fi - - if [ -r "${BASE}/lists/${LIVE_PACKAGE_LIST}" ] - then - LIVE_PACKAGE_LIST="${BASE}/lists/${LIVE_PACKAGE_LIST}" else LIVE_PACKAGE_LIST="${BASE}/lists/standard" fi + else + if [ ! -r "${LIVE_PACKAGE_LIST}" ] + then + if [ -r "${BASE}/lists/${LIVE_PACKAGE_LIST}" ] + then + LIVE_PACKAGE_LIST="${BASE}/lists/${LIVE_PACKAGE_LIST}" + else + LIVE_PACKAGE_LIST="${BASE}/lists/standard" + fi + fi fi # Set debian sections diff --git a/src/scripts/13hack.sh b/src/scripts/13hack.sh index 3468c57d9..bd3a33537 100644 --- a/src/scripts/13hack.sh +++ b/src/scripts/13hack.sh @@ -11,7 +11,8 @@ Hack_xorg () { - if [ -f "${LIVE_CHROOT}/etc/X11/xorg.conf" ] #&& [ "${LIVE_DISTRIBUTION_EXPERIMENTAL}" != "yes" ] + # xserver-xorg << 7.1 + if [ -f "${LIVE_CHROOT}/etc/X11/xorg.conf" ] && [ "${LIVE_DISTRIBUTION}" = "testing" ] then # Comment "BusID" line and set driver to "vesa" sed -i -e 's/\(^.*BusID.*\)/#\1/g' -e '/Section "Device"/,/EndSection/ s/\(.*Driver.*"\).*\(".*\)/\1vesa\2/g' "${LIVE_CHROOT}"/etc/X11/xorg.conf diff --git a/src/scripts/21image.sh b/src/scripts/21image.sh index 6357f0908..930315cc0 100644 --- a/src/scripts/21image.sh +++ b/src/scripts/21image.sh @@ -32,8 +32,6 @@ Indices () testing) echo "deb ${LIVE_MIRROR} testing ${LIVE_SECTION}" > "${LIVE_CHROOT}"/etc/apt/sources.list echo "deb-src ${LIVE_MIRROR} testing ${LIVE_SECTION}" >> "${LIVE_CHROOT}"/etc/apt/sources.list - echo "deb ${LIVE_MIRROR} testing-proposed-updates ${LIVE_SECTION}" >> "${LIVE_CHROOT}"/etc/apt/sources.list - echo "deb-src ${LIVE_MIRROR} testing-proposed-updates ${LIVE_SECTION}" >> "${LIVE_CHROOT}"/etc/apt/sources.list echo "deb ${LIVE_MIRROR_SECURITY} testing/updates ${LIVE_SECTION}" >> "${LIVE_CHROOT}"/etc/apt/sources.list echo "deb-src ${LIVE_MIRROR_SECURITY} testing/updates ${LIVE_SECTION}" >> "${LIVE_CHROOT}"/etc/apt/sources.list ;; @@ -77,8 +75,6 @@ EOF testing) echo "deb http://ftp.debian.org/debian/ testing ${LIVE_SECTION}" > "${LIVE_CHROOT}"/etc/apt/sources.list echo "deb-src http://ftp.debian.org/debian/ testing ${LIVE_SECTION}" >> "${LIVE_CHROOT}"/etc/apt/sources.list - echo "deb http://ftp.debian.org/debian/ testing-proposed-updates ${LIVE_SECTION}" >> "${LIVE_CHROOT}"/etc/apt/sources.list - echo "deb-src http://ftp.debian.org/debian/ testing-proposed-updates ${LIVE_SECTION}" >> "${LIVE_CHROOT}"/etc/apt/sources.list echo "deb http://security.debian.org/ testing/updates ${LIVE_SECTION}" >> "${LIVE_CHROOT}"/etc/apt/sources.list echo "deb-src http://security.debian.org/ testing/updates ${LIVE_SECTION}" >> "${LIVE_CHROOT}"/etc/apt/sources.list ;; diff --git a/src/scripts/22iso.sh b/src/scripts/22iso.sh index 96ab7778b..d990e2417 100644 --- a/src/scripts/22iso.sh +++ b/src/scripts/22iso.sh @@ -14,7 +14,10 @@ Iso () if [ ! -f "${LIVE_ROOT}"/.stage/image_binary ] then mkdir -p "${LIVE_ROOT}"/binary/casper - mv "${LIVE_ROOT}"/filesystem.manifest* "${LIVE_ROOT}"/binary/casper/ + for manifest in "${LIVE_ROOT}"/filesystem.manifest* + do + mv "${manifest}" "${LIVE_ROOT}"/binary/casper/ + done # Switching package indices to default if [ "${LIVE_GENERIC_INDICES}" = "yes" ] diff --git a/src/scripts/23net.sh b/src/scripts/23net.sh index 0b571efd5..c4169ecdd 100644 --- a/src/scripts/23net.sh +++ b/src/scripts/23net.sh @@ -15,7 +15,11 @@ Net () then mkdir -p "${LIVE_ROOT}"/binary/casper cp -r "${LIVE_TEMPLATES}"/common/* "${LIVE_ROOT}"/binary - mv "${LIVE_ROOT}"/filesystem.manifest* "${LIVE_ROOT}"/binary/casper + + for manifest in "${LIVE_ROOT}"/filesystem.manifest* + do + mv "${manifest}" "${LIVE_ROOT}"/binary/casper/ + done # Installing smbfs Chroot_exec "apt-get install --yes smbfs" |