diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/config | 10 | ||||
| -rwxr-xr-x | src/main.sh | 2 | ||||
| -rw-r--r-- | src/scripts/02defaults.sh | 2 | ||||
| -rw-r--r-- | src/scripts/14chroot.sh | 6 | ||||
| -rw-r--r-- | src/scripts/23net.sh | 6 |
5 files changed, 22 insertions, 4 deletions
diff --git a/src/config b/src/config index a319ada71..3cabd6f02 100644 --- a/src/config +++ b/src/config @@ -70,7 +70,7 @@ LIVE_REPOSITORY_bpo="http://www.backports.org/debian/" LIVE_REPOSITORY_KEY_bpo="http://backports.org/debian/archive.key" LIVE_REPOSITORY_KEYRING_bpo="" -LIVE_REPOSITORY_DISTRIBUTION="" +LIVE_REPOSITORY_DISTRIBUTION_bpo="sarge-backports" LIVE_REPOSITORY_SECTIONS_bpo="main contrib non-free" LIVE_REPOSITORY_edu="http://ftp.skolelinux.org/skolelinux/" @@ -82,9 +82,15 @@ LIVE_REPOSITORY_SECTIONS_edu="local" LIVE_REPOSITORY_duo="http://ftp.debian-unofficial.org/debian/" LIVE_REPOSITORY_KEY_duo="http://ftp-master.debian-unofficial.org/key_2006.asc" LIVE_REPOSITORY_KEYRING_duo="" -LIVE_REPOSITORY_DISTRIBUTION="" +LIVE_REPOSITORY_DISTRIBUTION_duo="" LIVE_REPOSITORY_SECTIONS_duo="main contrib non-free restricted" +LIVE_REPOSITORY_fai="http://www.informatik.uni-koeln.de/fai/download/" +LIVE_REPOSITORY_KEY_fai="" +LIVE_REPOSITORY_KEYRING_fai="" +LIVE_REPOSITORY_DISTRIBUTION_fai="etch" +LIVE_REPOSITORY_SECTIONS_fai="koeln" + # Debian section (Default: main) #LIVE_SECTION="main" diff --git a/src/main.sh b/src/main.sh index aa2e246f4..7367e84a0 100755 --- a/src/main.sh +++ b/src/main.sh @@ -28,7 +28,7 @@ set -e BASE="/usr/share/make-live" CONFIG="/etc/make-live.conf" PROGRAM="`basename ${0}`" -VERSION="0.99.9" +VERSION="0.99.10" CODENAME_OLDSTABLE="woody" CODENAME_STABLE="sarge" diff --git a/src/scripts/02defaults.sh b/src/scripts/02defaults.sh index d23c02135..dffa49018 100644 --- a/src/scripts/02defaults.sh +++ b/src/scripts/02defaults.sh @@ -53,7 +53,7 @@ Defaults () # Set debian distribution if [ -z "${LIVE_DISTRIBUTION}" ] then - LIVE_DISTRIBUTION="unstable" + LIVE_DISTRIBUTION="testing" else case "${LIVE_DISTRIBUTION}" in "${CODENAME_OLDSTABLE}") diff --git a/src/scripts/14chroot.sh b/src/scripts/14chroot.sh index e264128e0..bf3804095 100644 --- a/src/scripts/14chroot.sh +++ b/src/scripts/14chroot.sh @@ -27,6 +27,9 @@ Chroot () # Configure network Patch_network apply + # Mount proc + mount proc-live -t proc "${LIVE_CHROOT}"/proc + # Configure sources.list Indices custom @@ -129,6 +132,9 @@ Chroot () # Remove cdebootstrap packages cache rm -rf "${LIVE_CHROOT}"/var/cache/bootstrap + # Unmount proc + umount "${LIVE_CHROOT}"/proc + # Deconfigure network Patch_network deapply diff --git a/src/scripts/23net.sh b/src/scripts/23net.sh index 02869dd9b..78a036157 100644 --- a/src/scripts/23net.sh +++ b/src/scripts/23net.sh @@ -28,9 +28,15 @@ Net () mv "${MANIFEST}" "${LIVE_ROOT}"/binary/casper/ done + # Mount proc + mount proc-live -t proc "${LIVE_CHROOT}"/proc + # Installing smbfs Chroot_exec "apt-get install --yes --force-yes smbfs" + # Unmount proc + umount "${LIVE_CHROOT}"/proc + if [ "${LIVE_ARCHITECTURE}" = "amd64" ] || [ "${LIVE_ARCHITECTURE}" = "i386" ] then if [ ! -d "${LIVE_CHROOT}"/etc/initramfs-tools ] |