[debian-edu-commits] r83696 - trunk/src/debian-edu-install
ccscanf-guest at alioth.debian.org
ccscanf-guest at alioth.debian.org
Wed Aug 20 19:40:54 UTC 2014
Author: ccscanf-guest
Date: 2014-08-20 19:40:54 +0000 (Wed, 20 Aug 2014)
New Revision: 83696
Added:
trunk/src/debian-edu-install/README.migrated2git
Removed:
trunk/src/debian-edu-install/Makefile
trunk/src/debian-edu-install/README
trunk/src/debian-edu-install/TODO
trunk/src/debian-edu-install/apt-setup/
trunk/src/debian-edu-install/base-installer
trunk/src/debian-edu-install/debian-edu-profile
trunk/src/debian-edu-install/debian/
trunk/src/debian-edu-install/finish-install
trunk/src/debian-edu-install/lib/
trunk/src/debian-edu-install/post-base-installer
trunk/src/debian-edu-install/pre-pkgsel
trunk/src/debian-edu-install/preseed-values/
trunk/src/debian-edu-install/tools/
trunk/src/debian-edu-install/update-partman-recipes
trunk/src/debian-edu-install/version
Log:
Migration to git.
Deleted: trunk/src/debian-edu-install/Makefile
===================================================================
--- trunk/src/debian-edu-install/Makefile 2014-08-20 09:26:19 UTC (rev 83695)
+++ trunk/src/debian-edu-install/Makefile 2014-08-20 19:40:54 UTC (rev 83696)
@@ -1,98 +0,0 @@
-#
-# Install file for Debian-Edu debconf override package
-#
-
-INSTALL = install
-INSTALL_DATA= install -m 644
-
-libdir = /usr/lib
-templatedir = /usr/share/debconf/templates
-pkglibdir = $(libdir)/debian-edu-install
-sbindir = /usr/sbin
-sysconfdir = /etc
-
-PART_RECIPES = \
- 90edumain \
- 92edumain+ws \
- 96eduwork \
- 91edumain+ltsp \
- 94edultsp \
- 97minimal \
- 98edustandalone
-
-PART_ARCHES = \
- recipes \
- recipes-powerpc-powermac_newworld \
- recipes-powerpc-prep
-
-WRITE_ARCH_RECIPE = \
- sed -e "/>*>ARCH SPECIFIC<*</ r lib/partman/$$partarch-specific" \
- -e '/>*>ARCH SPECIFIC<*</ d' \
- lib/partman/common/$$partrecipe > lib/partman/$$partarch/$$partrecipe
-
-# Created using 'file * */*|grep Bourne|cut -d: -f1'
-SCRIPTS = $(shell file * */*|grep Bourne|cut -d: -f1)
-
-DEFAULTS = \
- common networked main-server workstation thin-client-server \
- standalone ltsp-chroot
-
-all: check
-check: update-partman-recipes check-scripts # check-defaults
-
-install:
- for profile in $(DEFAULTS) ; do \
- $(INSTALL_DATA) preseed-values/defaults.$$profile $(DESTDIR)$(pkglibdir)/; \
- done
- $(INSTALL_DATA) version $(DESTDIR)$(pkglibdir)
-
-debian-edu-profile.templates: debian/debian-edu-profile-udeb.templates
- (cd debian; po2debconf debian-edu-profile-udeb.templates) > $@
-
-.PHONY: profile-demo
-profile-demo: debian-edu-profile.templates
- chmod a+x ./debian-edu-profile
- DEBIAN_FRONTEND=dialog DEBCONF_DEBUG=developer /usr/share/debconf/frontend ./debian-edu-profile
- rm -f debian-edu-profile.templates
-
-# This check need write access to the debconf database.
-check-defaults:
- for profile in $(DEFAULTS) ; do \
- tools/debconf-load-defaults -c preseed-values/defaults.$$profile; \
- done
-
-# Detect typos in /bin/sh scripts
-check-scripts:
- for script in $(SCRIPTS) ; do \
- dash -n $$script ; \
- done
-
-update-partman-recipes: lib/partman/common/* lib/partman/recipes*-specific
- for partarch in $(PART_ARCHES) ; do \
- for partrecipe in $(PART_RECIPES) ; do \
- $(WRITE_ARCH_RECIPE) ;\
- done ; \
- done
- LC_ALL=C printf "Last made $@ `date` for:\n$(?F)\n" > $@ # Avoid redundant makes.
-
-install-partman-recipes: update-partman-recipes
- for partarch in $(PART_ARCHES) ; do \
- $(INSTALL_DATA) lib/partman/$$partarch/* $(DESTDIR)/lib/partman/$$partarch ;\
- done
-
-minimum-diskreq:
- @echo "Minimum disk requirements, in MiB:"
- @for profile in lib/partman/recipes*/* ; do \
- echo -n "$$profile " ; \
- grep '^[0-9]' $$profile |awk '{ sum=sum+$$1} END { print sum }' ; \
- done
-
-status:
- ( for f in debian/po/*.po; do \
- echo -n $$f:; LANG=C msgfmt --statistics -o /dev/null $$f 2>&1 ; \
- done ) | egrep 'fuzzy|untranslated' || true
-dist:
- debuild -us -uc
-
-clean:
- $(RM) *~
Deleted: trunk/src/debian-edu-install/README
===================================================================
--- trunk/src/debian-edu-install/README 2014-08-20 09:26:19 UTC (rev 83695)
+++ trunk/src/debian-edu-install/README 2014-08-20 19:40:54 UTC (rev 83696)
@@ -1,154 +0,0 @@
-Debian-edu installation override files
-======================================
-
-This package overrides all Debian debconf questions to make sure the
-Debian-edu CD can be installed non-interactively.
-
-More info is available from <URL:http://wiki.debian.org/DebianEdu/>.
-
- - Petter Reinholdtsen <pere at hungry.com>, 2002-01-06
-
-Extracting debconf values from d-i after installation
------------------------------------------------------
-
-apt-get install debconf-utils
-debconf-get-selections --installer
-
-How to update the partman partition rules
-=========================================
-
-The partition recipes are in lib/partman/common/. there are files for
-each combination of valid profile choises. the recipe file is built
-from the common file, and the arch specific file. to create the
-correct recipe file for arch and profile choice.
-
-The recipe consist of min, priority, max size and the file system
-type, as well as information about the file system to create. An
-example: The min and max sizes are min MiB.
-
- 32 2000 10000000 ext3
- $lvmok{ }
- method{ format }
- format{ }
- use_filesystem{ }
- filesystem{ ext3 }
- mountpoint{ /debianedufreespace } .
-
-The format is documented in
-http://d-i.alioth.debian.org/svn/debian-installer/installer/doc/devel/partman-auto-recipe.txt
-and http://lml.bas.bg/~anton/partman/doc/partman-doc.txt.
-The code using the recipes is in d-i subversion,
-packages/packages/partman/partman-auto/reciepes.sh.
-
-It is a good idea to make sure there is at least 15% free space on
-every partition, to avoid warnings from nagios about too full
-partitions in a freshly installed system. 5% is reserved for root,
-and the remaining 10% is the number nagios is checking. So, if 652
-MiB is used on /usr, the partition should be at least (652 * 100 / 85)
-= 767 MiB. It is a good idea to round up to the closest 64 MiB to
-take into account the overhead in file systems and LVM.
-
-One thing to keep in mind is that /var/ is used as storage area for
-downloaded debian packages during installation of the netinst CD, and
-thus need a lot more disk space during installation than after
-installation.
-
-To learn about the disk requirement for individual recipes, run the
-command 'make minimum-diskreq'.
-
-Some numbers to keep in mind. All numbers are disk space used in MiB,
-collected just after installation.
-
- Profile main-server (90edumain):
-
- Partition amd64 DVD i386 CD i386 DVD
- 2007-07-12 2007-07-17
- ------------------------------------------------------
- / 78 76
- /boot 18 18
- /usr 541 535
- /var 204 154
- /var/spool/squid 10 10
- /skole/backup 18 35
- /skole/tjener/home0 35 68
-
- Profile main-server + thinclient-server (91edumain+ltsp):
-
- Partition amd64 DVD i386 CD i386 DVD
- 2007-10-25 2007-07-27 2007-10-24
- ------------------------------------------------------
- / 98 82 80
- /boot 19 18 18
- /opt 554 525 516
- /skole/backup 35 17 17
- /skole/tjener/home0 173 17 35
- /usr 3204 3055 3051
- /var 328 912 257
- /var/opt/ltsp/swapfiles 69 17 34
- /var/spool/squid 10 10 10
-
- Profile main-server + workstation (92edumain+ws):
-
- Partition amd64 DVD i386 CD
- 2008-10-04
- ------------------------------------------
-
- / 98
- /boot 21
- /skole/backup 35
- /skole/tjener/home0 148
- /usr 4227
- /var 1732
- /var/spool/squid 90
-
- Profile thin-client-server (94edultsp):
-
- Partition amd64 DVD i386 CD
- 2007-07-16
- ------------------------------------------
-
- / 96
- /boot 18
- /opt 524
- /usr 2838
- /var 837
- /var/opt/ltsp/swapfiles 34
-
- Profile workstation (96eduwork):
-
- Partition amd64 DVD i386 CD
- 2008-10-05
- ------------------------------------------
- / 1695
- /boot 21
- /usr 4091
-
- Profile standalone (96eduwork):
-
- Partition amd64 DVD i386 CD i386 DVD powerpc CD
- 2007-07-20 2007-07-17 2008-10-04
- ------------------------------------------------------------------
- / 941 306 1676
- /boot 14 14 20
- /usr 2729 2723 3894
-
- Profile minimal (none):
-
- Partition amd64 DVD i386 CD i386 DVD
- 2007-07-20
- ------------------------------------------------------
- / 76
- /boot 18
- /var 579
- /usr 188
-
-Testing translations
-====================
-
-To test if the line wrapping work with translations, a command
-like this can be used:
-
- COLUMNS=77 podebconf-display-po debian/po/it.po
-
-It will simulate the terminal width available in the text mode
-of debian-installer.
Added: trunk/src/debian-edu-install/README.migrated2git
===================================================================
--- trunk/src/debian-edu-install/README.migrated2git (rev 0)
+++ trunk/src/debian-edu-install/README.migrated2git 2014-08-20 19:40:54 UTC (rev 83696)
@@ -0,0 +1,2 @@
+The package debian-edu-install has been migrated to Git on Alioth:
+http://anonscm.debian.org/gitweb/?p=debian-edu/debian-edu-install.git;a=summary
Deleted: trunk/src/debian-edu-install/TODO
===================================================================
--- trunk/src/debian-edu-install/TODO 2014-08-20 09:26:19 UTC (rev 83695)
+++ trunk/src/debian-edu-install/TODO 2014-08-20 19:40:54 UTC (rev 83696)
@@ -1,7 +0,0 @@
-Here are some tasks we should keep in mind.
-
- - ?
-
-Already done
-
- - Write partman recipes for the different profiles.
Deleted: trunk/src/debian-edu-install/base-installer
===================================================================
--- trunk/src/debian-edu-install/base-installer 2014-08-20 09:26:19 UTC (rev 83695)
+++ trunk/src/debian-edu-install/base-installer 2014-08-20 19:40:54 UTC (rev 83696)
@@ -1,83 +0,0 @@
-#! /bin/sh -e
-
-log() {
- logger -t debian-edu-install/base-installer "info: $*"
-}
-
-# remove the debianfreespace logical volume. Doing it before
-# installing packages, to make it possible to resize volumes on the
-# fly during installation.
-# FIXME check if partman support allocating free space and use this instead
-VG=$(mount | sed -n 's@^/dev/mapper/\(.*\)-root on /target.*@\1 at p')
-if [ -e /dev/$VG/debianedufreespace ] ; then
- if mount | grep -q /debianedufreespace ; then
- umount /target/debianedufreespace
- fi
- lvremove -f /dev/$VG/debianedufreespace
- grep -v /debianedufreespace /target/etc/fstab > /target/etc/fstab.new && \
- mv /target/etc/fstab.new /target/etc/fstab
-
- rmdir /target/debianedufreespace
-fi
-
-# Expand overfull file systems during installation, until /target is umounted.
-# Disabled 2012-01-28 as lvextend in chroot hang forever and block grub from
-# completing the installation. FIXME figure out why and fix or remove this code.
-if false ; then
-(
- # Make sure debian-edu-fsautoresize uses the same time zone as the
- # installer when running during installation (Solves Skolelinux
- # bug #1356), to avoid inconsistent time stamps in the
- # installation log.
- TZ=UTC
- export TZ
-
- # Workaround for in-target not accepting arguments as part of the command
- # to run. Need to create a temporary script that can be executed without
- # arguments. Can not create it in /target/tmp/, as it does not exist yet.
- # In Lenny, in-target handle arguments. This workaround can be
- # removed and the code made simpler. [pere 2009-12-14]
- # FIXME Rewrite with the new in-target support.
- script=/debian-edu-extend-file-systems
- if [ ! -f $script ] ; then # Avoid several loops running at the same time
- cat > /target$script <<EOF
-#!/bin/sh
-/usr/sbin/debian-edu-fsautoresize -n
-EOF
- chmod a+rx /target$script
- while [ -x /target$script ]; do
- if [ -x /target/usr/sbin/debian-edu-fsautoresize ] && [ -x /target/usr/bin/perl ]; then
- # Avoid in-target, as it can not run in parallel with
- # apt-install or in-target
- chroot /target $script || true
- fi
- sleep 10
- done
- # $script is removed in finish-install.d script
- fi
- # Close as many file descriptors as possible, to reduce the chance
- # of message leaks to debconf
-) < /dev/null > /dev/null 2>&1 3>&1 4>&1 5>&1 6>&1 7>&1 8>&1 9>&1 &
-fi
-
-# Need to do this here, as apt need to work via Squid to install
-# debian-edu-config where the permanent file is included.
-# FIXME check if this still is needed. See BTS report #565555.
-log "adding /etc/apt/apt.conf.d/90squid-di working around bug in Squid."
-cat > /target/etc/apt/apt.conf.d/90squid-di <<EOF
-// Avoid Squid handing out corrupt packages, solves Skolelinux bug #1419.
-Acquire::http::Pipeline-Depth 0;
-EOF
-
-log "setting up aptkey"
-if [ -f /usr/share/keyrings/archive.gpg -a ! -f /target/etc/apt/trusted.gpg ] ; then
- log "creating /etc/apt in target"
- mkdir -p /target/etc/apt
- log "copying archive.gpg as trusted.gpg under /etc/apt in target"
- cp /usr/share/keyrings/archive.gpg /target/etc/apt/trusted.gpg
-else
- test -f /usr/share/keyrings/archive.gpg || \
- log "missing archive.gpg keyring in the installer"
- test -f /target/etc/apt/trusted.gpg && \
- log "trusted.gpg already exists under /etc/apt in target"
-fi
Deleted: trunk/src/debian-edu-install/debian-edu-profile
===================================================================
--- trunk/src/debian-edu-install/debian-edu-profile 2014-08-20 09:26:19 UTC (rev 83695)
+++ trunk/src/debian-edu-install/debian-edu-profile 2014-08-20 19:40:54 UTC (rev 83696)
@@ -1,582 +0,0 @@
-#!/bin/sh -e
-
-. /usr/share/debconf/confmodule
-. /lib/preseed/preseed.sh # for $logfile
-. /lib/debian-edu-common
-
-log() {
- logger -t debian-edu-profile "info: $*"
-}
-
-error() {
- logger -t debian-edu-profile "error: $*"
-}
-
-add_preseed() {
- owner="$1"
- template="$2"
- type="$3"
- value="$4"
- echo $owner $template $type "$value" >> $preseedfile
-}
-
-ask_can_we_erase_harddrive() {
- # ask if the user want to repartition the hard drives
- # automaticaly, if not we will skip to manual mode
- db_settitle debian-edu-install/confirm/title
- db_input critical "debian-edu-install/confirm" || true
- db_go || true
- db_get "debian-edu-install/confirm" || true
- AUTOPARTITIONING="$RET"
- if test "$RET" = true ; then
- log "User accepted wiping out the harddrive"
- else
- log "User refused wiping out the harddrive, enabling manual partitioning"
- fi
-}
-
-ask_about_popcon() {
- #ask and preseed popcon here to save the need to monitor the install
- RET=""
- db_settitle debian-edu-install/participate-popcon/title
- db_input critical "debian-edu-install/participate-popcon" || true
- log "do we want popcon?"
- db_go || true
- db_get "debian-edu-install/participate-popcon" || true
- if test "$RET" = true ; then
- add_preseed popularity-contest popularity-contest/participate boolean true
- log "popcon: yes!"
- elif test "$RET" = false ; then
- add_preseed popularity-contest popularity-contest/participate boolean false
- log "popcon: no!"
- fi
-}
-
-check_profiles() {
- preseed=
- #if a value is unset it breaks the case esac later on
- workstation=false
- roaming=false
- ltspserver=false
- server=false
- networked=false
- standalone=false
- minimal=false
- sugar=false
-
- for value in `echo $EDUPROFILE |sed 's/ /-/g' | sed 's/,-/ /g'`; do
- case $value in
- Workstation)
- networked=true
- workstation=true
- log "Added task '$value'"
- ;;
- Roaming-Workstation)
- # Partition as Standalone, preseed as workstation
- networked=true
- workstation=true
- roaming=true
- if test "$server" = true ; then
- error=true
- else
- error=
- fi
- log "Added task '$value'"
- ;;
- Thin-Client-Server)
- networked=true
- workstation=true
- ltspserver=true
- log "Added task '$value'"
- ;;
- Main-Server|Server)
- networked=true
- server=true
- log "Added task '$value'"
- ;;
- Sugar)
- standalone=true
- sugar=true
- log "Added task '$value'"
- ;;
- Standalone)
- standalone=true
- if test "$networked" = true ; then
- error=true
- else
- error=
- fi
- log "Added task '$value'"
- ;;
- Minimal)
- networked=true
- minimal=true
- log "Added task '$value'"
- ;;
- *)
- error "unknown profile '$value'"
- ;;
- esac
- done
-}
-
-# Return the number of non-wireless network interfaces
-non_wifi_iface_count() {
- count=0
- for iface in $(ip -o link | grep '^.: eth'|cut -d: -f2) ; do
- if [ -d /sys/class/net/$iface/wireless ] ; then
- :
- else
- count=$(($count + 1))
- fi
- done
- echo $count
-}
-
-AUTOPARTITIONING=false
-
-#Detect debian-edu-expert mode
-#Treat an expert install as a debian-edu-expert mode
-if grep -iq debian-edu-expert /proc/cmdline ; then
- expert=true
-elif grep -iq 'priority=low' /proc/cmdline ; then
- expert=true
-else
- expert=false
-fi
-
-template="debian-edu-install/profile"
-
-preseedfile=/tmp/debian-edu-preseed.$$
-touch $preseedfile
-
-# Preselect based on what we can detect from the environment. If no
-# main-server is found, select main-server for non-laptops and
-# standalone for laptops. If a main-server is detected select
-# workstation for non-laptops, and roaming-workstation for laptops.
-# If more than one network interface is detected, preselect
-# Thin-Client-Server for non-laptops.
-if wget http://tjener/debian-edu-install.dat > /dev/null 2>&1 ; then
- log "main-server detected on the network"
- if laptop-detect ; then
- log "laptop detected, preselecting roaming workstation"
- defaultprofile="Roaming-Workstation"
- laptop=true
- else
- defaultprofile="Workstation"
- fi
-else
- log "main-server not detected on the network"
- if laptop-detect ; then
- log "laptop detected, preselecting standalone"
- defaultprofile="Standalone"
- laptop=true
- else
- defaultprofile="Main-Server, Thin-Client-Server, Workstation"
- mainserver=true
- fi
-fi
-
-if [ true != "$mainserver" ] && [ true != "$laptop" ] \
- && [ 1 -lt $(non_wifi_iface_count) ] ; then
- log "several network cards detected, preselecting thin-client-server"
- defaultprofile="$defaultprofile, Thin-Client-Server"
-fi
-
-log "choosing profile"
-
-# Do not load our default if the value was preseeded
-if db_fget "$template" seen && [ "$RET" = "false" ]; then
- log "Setting default profile to $defaultprofile"
- db_set "$template" "$defaultprofile"
-fi
-
-#ask profile question
-log "Debian-edu-expert = $expert"
-
-RET=""
-looplimit="xxx"
-loopcount=""
-
-while test -z "$RET" ; do
- db_input critical "$template" || [ $? -eq 30 ]
- db_go || true
- db_fset "$template" seen false || true
-
- db_get "$template" || true
- loopcount="x$loopcount"
- if test "$loopcount" = "$looplimit" ; then
- exit 1;
- fi
-done
-EDUPROFILE=$RET
-log "full profile is '$EDUPROFILE' loopcount='$loopcount'"
-
-
-check_profiles
-
-while test -n "$error" ; do
- db_fset "debian-edu-install/standalone_only" seen false || true
- db_input critical "debian-edu-install/standalone_only" || true
- log "Wrong selection in combination with Standalone"
- db_go || true
- if test "$expert" = true ; then
- template="debian-edu-install/profile-expert"
- else
- template"debian-edu-install/profile"
- fi
- db_fset "$template" seen false || true
- db_input critical "$template" || [ $? -eq 30 ]
- db_go || true
-
- db_get "$template" || true
- loopcount="x$loopcount"
- if test "$loopcount" = "$looplimit" ; then
- exit 1;
- fi
- if test -z "$RET" ; then
- continue;
- fi
- EDUPROFILE=$RET
- log "full profile is '$EDUPROFILE' loopcount='$loopcount'"
- check_profiles
-done
-
-# Make sure the default values have this priority, with lower number
-# priority overriding higher number
-# 1 main-server
-# 2 thin-client-server
-# 3 workstation
-# 4 networked (Common for non-standalone)
-# 5 standalone
-# 6 common
-
-preseeds="common"
-
-if test "$standalone" = true ; then
- preseeds="$preseeds standalone"
-fi
-if test "$networked" = true ; then
- preseeds="$preseeds networked"
-fi
-if test "$workstation" = true ; then
- preseeds="$preseeds workstation"
-fi
-if test "$ltspserver" = true ; then
- preseeds="$preseeds thin-client-server"
-fi
-if test "$server" = true ; then
- preseeds="$preseeds main-server"
-fi
-
-#
-# Select partitioning template (partman recipe), based on which
-# profile is selected
-#
-
-#use first available disk no matter what ?
-
-automatic_partitioning() {
- log "Using automatic_partitioning"
- arch=$(/bin/archdetect | cut -d"/" -f1)
- subarch=$(/bin/archdetect | cut -d"/" -f2)
- log "Detected arch : $arch"
- log "Detected subarch : $subarch"
-
- case "$arch-$subarch" in
- "i386-generic") #unset both use the default
- arch=
- subarch=
- ;;
- "powerpc-powermac_newworld") #set
- arch=-powerpc
- subarch=-powermac_newworld
- ;;
- "powerpc-prep") #set
- arch=-powerpc
- subarch=-prep
- ;;
- *) #just in case
- arch=
- subarch=
- ;;
- esac
-
- case "$server-$workstation-$ltspserver-$standalone-$minimal-$roaming" in
- "true-false-false-false-false-false") # single main server
- log "Preseeding partman for Single Main-server"
- db_set "partman-auto/choose_recipe" Debian-Edu Main-Server
- db_set "partman-auto/expert_recipe_file" /lib/partman/recipes$arch$subarch/90edumain
- ;;
- "false-true-true-false-false-false") # single ltspserver
- log "Preseeding partman for Single Thin-Client-Server"
- db_set "partman-auto/choose_recipe" Debian-Edu Thin-Client-Server
- db_set "partman-auto/expert_recipe_file" /lib/partman/recipes$arch$subarch/94edultsp
-
- # Configure the enable-nat script from debian-edu-config to
- # enable NAT on Thin-Client-Servers but not on Combi-Servers
- add_preseed debian-edu-config debian-edu-config/enable-nat boolean true
- ;;
- "false-true-false-false-false-false") # single workstation
- log "Preseeding partman for Single Workstation"
- db_set "partman-auto/choose_recipe" Debian-Edu Workstation
- db_set "partman-auto/expert_recipe_file" /lib/partman/recipes$arch$subarch/96eduwork
- ;;
- "false-true-false-false-false-true") # roaming workstatoin
- log "Preseeding partman for Single Roaming Workstation, select 98edustandalone recipe as default."
- db_set "partman-auto/choose_recipe" Debian-Edu Standalone
- db_set "partman-auto/expert_recipe_file" /lib/partman/recipes$arch$subarch/98edustandalone
- ;;
- "true-false-true-false-false-false") #mainserver & ltspserver
- log "Preseeding partman for Combo Main-server and Thin-Client-Server"
- db_set "partman-auto/choose_recipe" Debian-Edu Main-Server and Thin-Client-Server
- db_set "partman-auto/expert_recipe_file" /lib/partman/recipes$arch$subarch/91edumain+ltsp
-
- # Configure slbackup here in case we have a combo server installation
- add_preseed slbackup slbackup/client_location string "/etc /skole/tjener/home0 /opt/ltsp/i386/etc /var/backups"
- ;;
- "true-true-false-false-false-false") # mainserver & workstation
- log "Preseeding partman for Combo Main-Server and Workstation"
- db_set "partman-auto/choose_recipe" Debian-Edu Main-Server and Workstation
- db_set "partman-auto/expert_recipe_file" /lib/partman/recipes$arch$subarch/92edumain+ws
- ;;
- "true-true-true-false-false-false") # mainserver & ltspserver & workstation
- log "Preseeding partman for Combo Main-server, Thin-Client-Server, and workstation"
- db_set "partman-auto/choose_recipe" Debian-Edu Main-Server and Thin-Client-Server
- db_set "partman-auto/expert_recipe_file" /lib/partman/recipes$arch$subarch/91edumain+ltsp
-
- ;;
- "false-false-false-true-false-false") # standalone
- log "Preseeding partman for Single Standalone, select 98edustandalone recipe as default."
- db_set "partman-auto/choose_recipe" Debian-Edu Standalone
- db_set "partman-auto/expert_recipe_file" /lib/partman/recipes$arch$subarch/98edustandalone
- ;;
- "false-false-false-false-true-false") # minimal
- log "Preseeding partman for Minimal"
- db_set "partman-auto/choose_recipe" Debian-Edu Minimal
- db_set "partman-auto/expert_recipe_file" /lib/partman/recipes$arch$subarch/97minimal
- ;;
- esac
-
- # set recipe selection to seen
- db_fset "partman-auto/choose_recipe" seen true || true
- db_set "partman-auto-lvm/new_vg_name" vg_system
-
- # we dont want to see this
- db_set "partman/choose_partition" "Finish partitioning and write changes to disk"
- db_fset "partman/choose_partition" seen true || true
-
- # use first available disk
- # Disable in order to not lock up the installer, untill it's
- # reliable [Ronny Aasen 20080201]
- #db_set "partman-auto/disk" /dev/discs/disc0/disc
- #and method lvm
- db_set "partman-auto/method" lvm
- db_fset "partman-auto/method" seen true || true
-
- # This question is asked when there are more than one disk found.
- # Ensure the correct answer is set.
- db_set "partman-auto/init_automatically_partition" "60some_device_lvm__________lvm"
- db_fset "partman-auto/init_automatically_partition" seen true || true
-
- add_preseed partman-lvm partman-lvm/confirm boolean true
- add_preseed partman-lvm partman-lvm/confirm_nooverwrite boolean true
-
- # we do not want to see the confirm write to disk, or the purge lvm
- # questions. We have asked this already
- add_preseed partman partman/confirm_write_new_label boolean true
- add_preseed partman partman/confirm boolean true
- add_preseed partman partman/confirm_nooverwrite boolean true
- add_preseed partman-lvm partman-lvm/device_remove_lvm boolean true
-}
-
-ask_can_we_erase_harddrive
-
-if [ true = "$AUTOPARTITIONING" ] ; then
- automatic_partitioning
-fi
-
-ask_about_popcon
-
-# any server
-case "$server" in
- "true")
- # install exim4-daemon-heavy early.
- db_set "base-installer/includes" "exim4-daemon-heavy"
- ;;
-esac
-
-# This code need to be executed here and pass the info found on to the
-# prebaseconfig script, and not in the prebaseconfig script itself,
-# because the CD is unmounted when the prebaseconfig script is running.
-
-# Based on function from base-installer
-set_mirror_info () {
- if [ -f /cdrom/.disk/base_installable ]; then
- PROTOCOL=file
- MIRROR=""
- DIRECTORY="/cdrom/"
- db_get cdrom/codename || true
- if [ "$RET" ] ; then
- SUITE="$RET"
- else
- SUITE=testing
- error "Unable to find CD suite name"
- fi
- else
- mirror_error=""
-
- db_get mirror/protocol || mirror_error=1
- PROTOCOL="$RET"
-
- db_get mirror/$PROTOCOL/hostname || mirror_error=1
- MIRROR="$RET"
-
- db_get mirror/$PROTOCOL/directory || mirror_error=1
- DIRECTORY="$RET"
-
- if [ "$mirror_error" = 1 ] || [ -z "$PROTOCOL" ] || [ -z "$MIRROR" ]; then
- error "Missing mirror settings. Can not find DISTRIBUTION name."
- return
- fi
- fi
-
- if db_get mirror/suite && [ "$RET" ] ; then
- SUITE=$RET
- fi
- # Find the distribution codename
- APTLISTDIR=/var/tmp
- mkdir -p $APTLISTDIR
- if [ file = "$PROTOCOL" ]; then
- path="/cdrom/dists/$SUITE/Release"
- cp $path $APTLISTDIR/tmp 2>/dev/null || nogetrel="$path"
- else
- load_proxy_conf
-
- path="$PROTOCOL://$MIRROR$DIRECTORY/dists/$SUITE/Release"
- wget -q "$path" -O $APTLISTDIR/tmp || nogetrel="$path"
- fi
-
- if [ "$nogetrel" != "" ]; then
- error "Unable to locate '$nogetrel'. Can not find DISTRIBUTION name."
- return
- fi
-
- DISTRIBUTION=`grep ^Codename: $APTLISTDIR/tmp | cut -d' ' -f 2`
- rm $APTLISTDIR/tmp
- db_set mirror/distribution "$DISTRIBUTION"
- log "Setting mirror/distribution to $DISTRIBUTION"
-}
-
-set_mirror_info
-
-if edu-is-testinstall ; then
- de_suite="$DISTRIBUTION-test"
-else
- de_suite="$DISTRIBUTION"
-fi
-
-db_register debian-installer/dummy apt-setup/local0/repository
-db_register debian-installer/dummy apt-setup/local0/comment
-db_register debian-installer/dummy apt-setup/local0/source
-db_register debian-installer/dummy apt-setup/local0/key
-
-archstr=$(/bin/archdetect)
-if [ -f /cdrom/.disk/cd_type ] && grep -iq dvd /cdrom/.disk/cd_type; then
- #disable mirror usage if we install from dvd
- db_set "apt-setup/use_mirror" false
- db_fset "apt-setup/use_mirror" seen true || true
- log "disabling mirror selection on dvd's"
- # Make sure it is disabled
- db_set "apt-setup/local0/comment" "" || true
- db_set "apt-setup/local0/repository" "" || true
- db_set "apt-setup/local0/source" true || true
-
-elif ! log-output wget -U "Wget, Debian Edu d-i $de_suite $archstr" -qO - http://ftp.skolelinux.org/welcome.msg ; then
- db_settitle debian-edu-install/no-network/title
- db_input critical "debian-edu-install/no-network" || true
- db_go || true
- exit 1
-else
- #Enable mirrors for the rest
- log "We will have net, enable the mirrors"
- db_set "apt-setup/use_mirror" true
- db_fset "apt-setup/use_mirror" seen true || true
- #preseed skolelinux repo active
- db_set "apt-setup/local0/comment" "Debian Edu $de_suite repository" || true
- db_set "apt-setup/local0/repository" "http://ftp.skolelinux.org/skolelinux $de_suite local" || true
- db_set "apt-setup/local0/source" true || true
- #key must be available, if not apt-setup ignores our repo.
- db_set "apt-setup/local0/key" "http://ftp.skolelinux.org/pub/debian-edu-archive.key" || true
-fi
-
-
-
-
-log "Preseeding"
-
-if [ "$EDUPROFILE" ] ; then
- log "Preseeding target with '$EDUPROFILE'"
- add_preseed debian-edu-install debian-edu-install/profile multiselect "$EDUPROFILE"
-else
- log "No profile to preseed"
-fi
-
-# In order to show less questions in the rest of the installation, we
-# change debconf/priority to critical if the installer is run in the
-# default manner.
-# Do not mess with priority if the user have defined a priority in the
-# boot arguments.
-if grep -iq 'priority' /proc/cmdline ; then
- return 0
-else
- # Do not mess with priority if the user runs in expert mode.
- if [ false = "$expert" ] ; then
- # Check if it runs at default value, and bump if it does.
- if db_get debconf/priority && [ "$RET" ] ; then
- if [ $RET == "high" ] ; then db_set "debconf/priority" "critical"; fi
- fi
- fi
-fi
-
-
-for preseed in $preseeds ; do
- if [ -f /usr/lib/debian-edu-install/defaults.$preseed ] ; then
- log "Found preseeding for '$preseed'"
- cat /usr/lib/debian-edu-install/defaults.$preseed >> $preseedfile
- else
- error "Unable to find preseeding for '$preseed'"
- fi
-done
-
-# Enable the firstboot script to report installation errors. Preseeded
-# here and not in defaults.common to make sure it only is set on first time
-# installation using debian-installer. Checking the seen flag to allow
-# this setting to be overriden using preseeding.
-db_fget debian-edu-install/run-firstboot seen || true
-if [ true != "$RET" ] ; then
- add_preseed debian-edu-install debian-edu-install/run-firstboot boolean true
-fi
-
-# Load into the cdebconf database used by d-i
-debconf-set-selections $preseedfile || \
- error "Failed to load preseed values from $preseedfile"
-
-# Get the post-base-installer.d fragment from preseed to pass relevant
-# values into the debconf database in /target when the base system is
-# installed.
-touch $logfile # Create if missing, to make sure >> work
-cat $preseedfile >> $logfile
-
-# rm $preseedfile
-
-# Make sure that the kernel question doesn't show up. Can not use
-# preseeding directly, as these values are not loaded yet when this
-# script run.
-db_fset "base-installer/kernel/image" seen true || true
-db_fset "base-installer/kernel/which-kernel" seen true || true
-
-# Avoid message which sometimes appears with newer x11-common due to
-# upgrade issues. Can not use preseeding directly, as these values
-# are not loaded yet when this script run.
-db_fset "x11-common/upgrade_issues" seen true || true
Deleted: trunk/src/debian-edu-install/finish-install
===================================================================
--- trunk/src/debian-edu-install/finish-install 2014-08-20 09:26:19 UTC (rev 83695)
+++ trunk/src/debian-edu-install/finish-install 2014-08-20 19:40:54 UTC (rev 83696)
@@ -1,30 +0,0 @@
-#! /bin/sh -e
-#
-# Last finishing touch before rebooting into the installed system.
-
-. /usr/share/debconf/confmodule
-. /lib/debian-edu-common
-
-# Stop automatic lvm resize script set up before base-installer
-# started.
-rm -f /target/debian-edu-extend-file-systems
-
-log() {
- logger -t 10debian-edu-install "$@"
-}
-
-error() {
- logger -t 10debian-edu-install "error: $@"
-}
-
-load_proxy_conf
-
-hook=/target/usr/share/debian-edu-config/d-i/finish-install
-if [ -x $hook ] ; then
- log "Running debian-edu-config finish-install hook"
- $hook
-else
- error "Unable to find $hook"
-fi
-
-exit 0
Deleted: trunk/src/debian-edu-install/post-base-installer
===================================================================
--- trunk/src/debian-edu-install/post-base-installer 2014-08-20 09:26:19 UTC (rev 83695)
+++ trunk/src/debian-edu-install/post-base-installer 2014-08-20 19:40:54 UTC (rev 83696)
@@ -1,9 +0,0 @@
-#!/bin/sh -e
-#
-# Executed using the post-base-installer hooks after the base system
-# is installed, and before most packages are installed.
-
-# Initialize etckeeper early
-edu-etcvcs init
-
-exit 0
Deleted: trunk/src/debian-edu-install/pre-pkgsel
===================================================================
--- trunk/src/debian-edu-install/pre-pkgsel 2014-08-20 09:26:19 UTC (rev 83695)
+++ trunk/src/debian-edu-install/pre-pkgsel 2014-08-20 19:40:54 UTC (rev 83696)
@@ -1,94 +0,0 @@
-#!/bin/sh
-
-set -e
-
-#export DEBCONF_DEBUG='developer'
-. /usr/share/debconf/confmodule
-. /lib/debian-edu-common
-
-log() {
- logger -t edu-pre-pkgsel "info: $*"
-}
-
-error() {
- logger -t edu-pre-pkgsel "error: $*"
-}
-
-load_proxy_conf
-
-db_get debian-edu-install/profile
-PROFILE="$RET"
-
-db_get debian-installer/language
-LANGCODE="$RET"
-
-db_get debian-installer/locale
-LOCALE="$RET"
-
-if [ ! -d /target/etc/debian-edu ] ; then
- if mkdir /target/etc/debian-edu ; then
- :
- else
- error "unable to create /target/etc/debian-edu"
- fi
-fi
-
-# For the stable etch release, use '3.0r0 terra' as the version number
-VERSION="$(cat /usr/lib/debian-edu-install/version || true)"
-if [ -z "$VERSION" ] ; then
- error "missing /usr/lib/debian-edu-install/version, incomplete /etc/debian-edu/config created."
-fi
-
-(
- echo "# Generated by debian-edu-profile-udeb"
- echo "VERSION=\"$VERSION\""
- echo "PROFILE=\"$PROFILE\""
- echo "LANGCODE=\"$LANGCODE\""
- echo "LOCALE=\"$LOCALE\""
-) >> /target/etc/debian-edu/config
-
-if edu-is-testinstall ; then
- echo "TESTINSTALL=\"true\"" >> /target/etc/debian-edu/config
-fi
-
-edu-etcvcs commit
-
-log "asking for a few extra packages to be installed"
-# debian-edu-archive-keyring - our local archive keyring
-# education-tasks - education tasksel tasks
-# debian-edu-install - the debian-edu preseeding files
-failed=""
-for p in debian-edu-archive-keyring education-tasks debian-edu-install
-do
- if apt-install $p ; then
- :
- else
- template=debian-edu-install/errors-pkg-installation
- db_subst $template PACKAGES "$p"
- db_fset $template seen false
- db_capb "" # Disable "Go Back" button
- db_settitle $template-title
- db_input critical $template || [ $? -eq 30 ]
- db_go
- db_capb backup
- reboot
- fi
-done
-
-edu-etcvcs commit
-
-# Clean up file added in base-installer, now that debian-edu-config is
-# installed (pulled in via debian-edu-install).
-rm -f /target/etc/apt/apt.conf.d/90squid-di
-
-edu-etcvcs commit
-
-hook=/target/usr/share/debian-edu-config/d-i/pre-pkgsel
-if [ -x $hook ] ; then
- log "Running debian-edu-config pre-pkgsel hook"
- $hook
-fi
-
-edu-etcvcs commit
-
-exit 0
Deleted: trunk/src/debian-edu-install/update-partman-recipes
===================================================================
--- trunk/src/debian-edu-install/update-partman-recipes 2014-08-20 09:26:19 UTC (rev 83695)
+++ trunk/src/debian-edu-install/update-partman-recipes 2014-08-20 19:40:54 UTC (rev 83696)
@@ -1,2 +0,0 @@
-Last made update-partman-recipes lø. 28. jan. 10:00:14 +0100 2012 for:
-96eduwork
Deleted: trunk/src/debian-edu-install/version
===================================================================
--- trunk/src/debian-edu-install/version 2014-08-20 09:26:19 UTC (rev 83695)
+++ trunk/src/debian-edu-install/version 2014-08-20 19:40:54 UTC (rev 83696)
@@ -1 +0,0 @@
-6.0.7+edu+r1
More information about the debian-edu-commits
mailing list