diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2012-08-21 18:14:43 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2012-08-21 18:14:43 +0200 |
| commit | eae22f6f1d42cce7139442f7651957dfa072d6a0 (patch) | |
| tree | e7c26d2705d1e02e96f43538f7972fe4493dc973 | |
| parent | 2ae54f80e2f792acce8eb832572c5ccd321aa165 (diff) | |
| download | internet-kiosk-eae22f6f1d42cce7139442f7651957dfa072d6a0.tar.gz internet-kiosk-eae22f6f1d42cce7139442f7651957dfa072d6a0.tar.bz2 internet-kiosk-eae22f6f1d42cce7139442f7651957dfa072d6a0.zip | |
Step towards wheezy, use it as default distribution.
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | internet-kiosk-management/etc/ik_settings | 5 | ||||
| -rwxr-xr-x | internet-kiosk-management/sbin/ik_create | 11 |
3 files changed, 17 insertions, 6 deletions
diff --git a/debian/changelog b/debian/changelog index 36a3bb8..94b52b2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +internet-kiosk (0.0.2-0~edu1) UNRELEASED; urgency=low + + * New upstream version (0.0.2): + - Step towards wheezy, use it as default distribution. + + -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Tue, 21 Aug 2012 18:14:02 +0200 + internet-kiosk (0.0.1-0~edu1) unstable; urgency=low * First upstream version (0.0.1): diff --git a/internet-kiosk-management/etc/ik_settings b/internet-kiosk-management/etc/ik_settings index 1b33fe9..c06f6f4 100644 --- a/internet-kiosk-management/etc/ik_settings +++ b/internet-kiosk-management/etc/ik_settings @@ -31,8 +31,11 @@ IK_SHELL="bash" # Debian package mirror to use... IK_DEBMIRROR_URL="http://ftp.debian.org/debian" +# Distro code name to use... +IK_DISTRO_CODENAME="wheezy" + # Retrieve extra packages from this URL -IK_EXTRA_DEBURL="deb http://packages.it-zukunft-schule.de/debian squeeze main" +IK_EXTRA_DEBURL="deb http://packages.it-zukunft-schule.de/debian $IK_DISTRO_CODENAME main" # Use a http/ftp proxy during debootstrap (leave empty if direct connections to http/ftp are allowed) # IK_HTTP_PROXY="http://webcache.intern:3128" diff --git a/internet-kiosk-management/sbin/ik_create b/internet-kiosk-management/sbin/ik_create index 3546228..52de279 100755 --- a/internet-kiosk-management/sbin/ik_create +++ b/internet-kiosk-management/sbin/ik_create @@ -36,8 +36,9 @@ source $ETCDIR/ik_settings IK_BASE="${IK_BASE:-/opt/internet-kiosk}" IK_CHROOT="${IK_CHROOT:-$IK_BASE/chroot}" IK_CONFIG="${IK_CONFIG:-$IK_BASE/etc}" +IK_DISTRO_CODENAME="${IK_DISTRO_CODENAME:-wheezy}" IK_DEBMIRROR_URL="${IK_DEBMIRROR_URL:-'http://ftp.debian.org/debian'}" -IK_EXTRA_DEBURL="${IK_EXTRA_DEBURL:-'deb http://packages.it-zukunft-schule.de squeeze main'}" +IK_EXTRA_DEBURL="${IK_EXTRA_DEBURL:-'deb http://packages.it-zukunft-schule.de $IK_DISTRO_CODENAME main'}" IK_MODULE_BLACKLIST="${IK_MODULE_BLACKLIST:-'pcspkr'}" test -e "$IK_CHROOT" && { @@ -69,7 +70,7 @@ export http_proxy="$IK_HTTP_PROXY" export https_proxy="$IK_HTTPS_PROXY" export ftp_proxy="$IK_FTP_PROXY" -debootstrap --arch i386 stable $IK_CHROOT/ $IK_DEBMIRROR_URL +debootstrap --arch i386 $IK_DISTRO_CODENAME $IK_CHROOT/ $IK_DEBMIRROR_URL cp /etc/resolv.conf $IK_CHROOT/etc/resolv.conf echo "auto lo" >> $IK_CHROOT/etc/network/interfaces echo "iface lo inet loopback" >> $IK_CHROOT/etc/network/interfaces @@ -93,7 +94,7 @@ none /var/lib/alsa tmpfs size=50M 0 0 EOF -cat > $IK_CHROOT/ikdt_install.sh <<EOF +cat > $IK_CHROOT/ik_dte_install.sh <<EOF #!/bin/bash export LANG=C @@ -163,8 +164,8 @@ PATCH umount -l /proc &>/dev/null umount -l /dev/pts &>/dev/null EOF -chmod u+x $IK_CHROOT/ikdt_install.sh -chroot $IK_CHROOT /ikdt_install.sh +chmod u+x $IK_CHROOT/ik_dte_install.sh +chroot $IK_CHROOT /ik_dte_install.sh rm -f $IK_CHROOT/etc/udev/rules.d/*-persistent-*.rules |