summaryrefslogtreecommitdiff
path: root/helpers
diff options
context:
space:
mode:
Diffstat (limited to 'helpers')
-rwxr-xr-xhelpers/lh_binary_disk62
-rwxr-xr-xhelpers/lh_chroot_sources60
-rwxr-xr-xhelpers/lh_config2
-rwxr-xr-xhelpers/lh_source_disk34
4 files changed, 57 insertions, 101 deletions
diff --git a/helpers/lh_binary_disk b/helpers/lh_binary_disk
index e03b0fb14..36f1984d2 100755
--- a/helpers/lh_binary_disk
+++ b/helpers/lh_binary_disk
@@ -64,58 +64,48 @@ then
ARCHITECTURE="Snapshot ${ARCHITECTURE}"
fi
-case "${LH_MODE}" in
- debian)
- case "${LH_DEBIAN_INSTALLER}" in
- cdrom)
- echo "main" > binary/.disk/base_components
+case "${LH_DEBIAN_INSTALLER}" in
+ cdrom)
+ echo "main" > binary/.disk/base_components
- touch binary/.disk/base_installable
+ touch binary/.disk/base_installable
- echo "full_cd" > binary/.disk/cd_type
+ echo "full_cd" > binary/.disk/cd_type
- echo "Debian GNU/Linux ${VERSION} \"${DISTRIBUTION}\" - Official ${ARCHITECTURE} CD Binary $(date +%Y%m%d-%H:%M)" > binary/.disk/info
+ echo "Debian GNU/Linux ${VERSION} \"${DISTRIBUTION}\" - Official ${ARCHITECTURE} CD Binary $(date +%Y%m%d-%H:%M)" > binary/.disk/info
- cp "${LH_BASE}"/data/debian-cd/${LH_DISTRIBUTION}/${LH_ARCHITECTURE}_udeb_include binary/.disk/udeb_include
- ;;
-
- enabled|netinst|live)
- echo "main" > binary/.disk/base_components
+ cp "${LH_BASE}"/data/debian-cd/${LH_DISTRIBUTION}/${LH_ARCHITECTURE}_udeb_include binary/.disk/udeb_include
+ ;;
- touch binary/.disk/base_installable
+ enabled|netinst|live)
+ echo "main" > binary/.disk/base_components
- echo "not_complete" > binary/.disk/cd_type
+ touch binary/.disk/base_installable
- echo "Debian GNU/Linux ${VERSION} \"${DISTRIBUTION}\" - Official ${ARCHITECTURE} NETINST Binary $(date +%Y%m%d-%H:%M)" > binary/.disk/info
+ echo "not_complete" > binary/.disk/cd_type
- cp "${LH_BASE}"/data/debian-cd/${LH_DISTRIBUTION}/${LH_ARCHITECTURE}_netinst_udeb_include binary/.disk/udeb_include
+ echo "Debian GNU/Linux ${VERSION} \"${DISTRIBUTION}\" - Official ${ARCHITECTURE} NETINST Binary $(date +%Y%m%d-%H:%M)" > binary/.disk/info
- if [ "${LH_DEBIAN_INSTALLER}" = "live" ]
- then
- echo "live-installer" >> binary/.disk/udeb_include
- fi
- ;;
+ cp "${LH_BASE}"/data/debian-cd/${LH_DISTRIBUTION}/${LH_ARCHITECTURE}_netinst_udeb_include binary/.disk/udeb_include
- businesscard)
- echo "main" > binary/.disk/base_components
+ if [ "${LH_DEBIAN_INSTALLER}" = "live" ]
+ then
+ echo "live-installer" >> binary/.disk/udeb_include
+ fi
+ ;;
- echo "not_complete" > binary/.disk/cd_type
+ businesscard)
+ echo "main" > binary/.disk/base_components
- echo "Debian GNU/Linux ${VERSION} \"${DISTRIBUTION}\" - Official ${ARCHITECTURE} BC Binary $(date +%Y%m%d-%H:%M)" > binary/.disk/info
+ echo "not_complete" > binary/.disk/cd_type
- cp "${LH_BASE}"/data/debian-cd/${LH_DISTRIBUTION}/${LH_ARCHITECTURE}_businesscard_udeb_include binary/.disk/udeb_include
- ;;
+ echo "Debian GNU/Linux ${VERSION} \"${DISTRIBUTION}\" - Official ${ARCHITECTURE} BC Binary $(date +%Y%m%d-%H:%M)" > binary/.disk/info
- disabled)
- echo "Debian GNU/Linux ${VERSION} \"${DISTRIBUTION}\" - Official ${ARCHITECTURE} LIVE Binary $(date +%Y%m%d-%H:%M)" > binary/.disk/info
- ;;
- esac
+ cp "${LH_BASE}"/data/debian-cd/${LH_DISTRIBUTION}/${LH_ARCHITECTURE}_businesscard_udeb_include binary/.disk/udeb_include
;;
- ubuntu)
- # FIXME
- echo "Ubuntu Linux ${VERSION} \"${DISTRIBUTION}\" - Unofficial ${ARCHITECTURE} LIVE/NETINST Binary $(date +%Y%m%d-%H:%M)" > binary/.disk/info
- # Ubuntu 7.04 "Feisty Fawn" - Release i386 (20070418)
+ disabled)
+ echo "Debian GNU/Linux ${VERSION} \"${DISTRIBUTION}\" - Official ${ARCHITECTURE} LIVE Binary $(date +%Y%m%d-%H:%M)" > binary/.disk/info
;;
esac
diff --git a/helpers/lh_chroot_sources b/helpers/lh_chroot_sources
index 61e0b66d7..632daf6e7 100755
--- a/helpers/lh_chroot_sources
+++ b/helpers/lh_chroot_sources
@@ -59,28 +59,15 @@ case "${1}" in
if [ "${LH_SECURITY}" = "enabled" ]
then
- case "${LH_MODE}" in
- debian)
- if [ "${LH_DISTRIBUTION}" != "sid" ] && [ "${LH_DISTRIBUTION}" != "unstable" ]
- then
- echo "deb ${LH_MIRROR_BOOTSTRAP_SECURITY} ${LH_DISTRIBUTION}/updates ${LH_SECTIONS}" >> chroot/etc/apt/sources.list
-
- if [ "${LH_SOURCE}" = "enabled" ]
- then
- echo "deb-src ${LH_MIRROR_BOOTSTRAP_SECURITY} ${LH_DISTRIBUTION}/updates ${LH_SECTIONS}" >> chroot/etc/apt/sources.list
- fi
- fi
- ;;
-
- ubuntu)
- echo "deb ${LH_MIRROR_BOOTSTRAP_SECURITY} ${LH_DISTRIBUTION}-security ${LH_SECTIONS}" >> chroot/etc/apt/sources.list
+ if [ "${LH_DISTRIBUTION}" != "sid" ] && [ "${LH_DISTRIBUTION}" != "unstable" ]
+ then
+ echo "deb ${LH_MIRROR_BOOTSTRAP_SECURITY} ${LH_DISTRIBUTION}/updates ${LH_SECTIONS}" >> chroot/etc/apt/sources.list
- if [ "${LH_SOURCE}" = "enabled" ]
- then
- echo "deb-src ${LH_MIRROR_BOOTSTRAP_SECURITY} ${LH_DISTRIBUTION}-security ${LH_SECTIONS}" >> chroot/etc/apt/sources.list
- fi
- ;;
- esac
+ if [ "${LH_SOURCE}" = "enabled" ]
+ then
+ echo "deb-src ${LH_MIRROR_BOOTSTRAP_SECURITY} ${LH_DISTRIBUTION}/updates ${LH_SECTIONS}" >> chroot/etc/apt/sources.list
+ fi
+ fi
fi
# Check local sources.list
@@ -237,28 +224,15 @@ case "${1}" in
if [ "${LH_SECURITY}" = "enabled" ]
then
- case "${LH_MODE}" in
- debian)
- if [ "${LH_DISTRIBUTION}" != "sid" ] && [ "${LH_DISTRIBUTION}" != "unstable" ]
- then
- echo "deb ${LH_MIRROR_BINARY_SECURITY} ${LH_DISTRIBUTION}/updates ${LH_SECTIONS}" >> chroot/etc/apt/sources.list
-
- if [ "${LH_SOURCE}" = "enabled" ]
- then
- echo "deb-src ${LH_MIRROR_BINARY_SECURITY} ${LH_DISTRIBUTION}/updates ${LH_SECTIONS}" >> chroot/etc/apt/sources.list
- fi
- fi
- ;;
-
- ubuntu)
- echo "deb ${LH_MIRROR_BINARY_SECURITY} ${LH_DISTRIBUTION}-security ${LH_SECTIONS}" >> chroot/etc/apt/sources.list
-
- if [ "${LH_SOURCE}" = "enabled" ]
- then
- echo "deb-src ${LH_MIRROR_BINARY_SECURITY} ${LH_DISTRIBUTION}-security ${LH_SECTIONS}" >> chroot/etc/apt/sources.list
- fi
- ;;
- esac
+ if [ "${LH_DISTRIBUTION}" != "sid" ] && [ "${LH_DISTRIBUTION}" != "unstable" ]
+ then
+ echo "deb ${LH_MIRROR_BINARY_SECURITY} ${LH_DISTRIBUTION}/updates ${LH_SECTIONS}" >> chroot/etc/apt/sources.list
+
+ if [ "${LH_SOURCE}" = "enabled" ]
+ then
+ echo "deb-src ${LH_MIRROR_BINARY_SECURITY} ${LH_DISTRIBUTION}/updates ${LH_SECTIONS}" >> chroot/etc/apt/sources.list
+ fi
+ fi
fi
# Check local sources.list
diff --git a/helpers/lh_config b/helpers/lh_config
index 7d8614a69..7e99e3008 100755
--- a/helpers/lh_config
+++ b/helpers/lh_config
@@ -75,7 +75,7 @@ USAGE="${PROGRAM} [--apt apt|aptitude]\n\
\t [--mirror-binary URL]\n\
\t [--mirror-bootstrap-security URL]\n\
\t [--mirror-bootstrap URL]\n\
-\t [--mode debian|debian-edu|ubuntu]\n\
+\t [--mode debian|debian-edu]\n\
\t [--net-filesystem nfs|cfs]\n\
\t [--net-mountoptions OPTIONS]\n\
\t [--net-path PATH]\n\
diff --git a/helpers/lh_source_disk b/helpers/lh_source_disk
index b744a8a54..433a71023 100755
--- a/helpers/lh_source_disk
+++ b/helpers/lh_source_disk
@@ -59,27 +59,19 @@ DISTRIBUTION="$(echo ${LH_DISTRIBUTION} | cut -b 1 | tr '[a-z]' '[A-Z]')"
DISTRIBUTION="${DISTRIBUTION}$(echo ${LH_DISTRIBUTION} | cut -b 2-)"
eval VERSION="$`echo VERSION_${LH_DISTRIBUTION}`"
-case "${LH_MODE}" in
- debian)
- if [ -d binary/pool/main/b/base-installer ]
- then
- if [ -d binary/pool/main/l/live-installer ]
- then
- TYPE="LIVE/INSTALL"
- fi
-
- TYPE="LIVE/NETINST"
- else
- TYPE="LIVE"
- fi
-
- echo "Debian GNU/Linux ${VERSION} \"${DISTRIBUTION}\" - Official ${ARCHITECTURE} ${TYPE} Source $(date +%Y%m%d-%H:%M)" > source/.disk/info
- ;;
-
- ubuntu)
- echo "Ubuntu Linux ${VERSION} \"${DISTRIBUTION}\" - Unofficial ${ARCHITECTURE} LIVE/NETINST Source $(date +%Y%m%d-%H:%M)" > source/.disk/info
- ;;
-esac
+if [ -d binary/pool/main/b/base-installer ]
+then
+ if [ -d binary/pool/main/l/live-installer ]
+ then
+ TYPE="LIVE/INSTALL"
+ fi
+
+ TYPE="LIVE/NETINST"
+else
+ TYPE="LIVE"
+fi
+
+echo "Debian GNU/Linux ${VERSION} \"${DISTRIBUTION}\" - Official ${ARCHITECTURE} ${TYPE} Source $(date +%Y%m%d-%H:%M)" > source/.disk/info
# Creating stage file
Create_stagefile .stage/source_disk
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-11 15:23:12 +0000