From 904f5e34fbd3876b122b0842f74d332f4de5a287 Mon Sep 17 00:00:00 2001 From: Holger Levsen Date: Fri, 21 Nov 2014 12:39:52 +0100 Subject: reproducible: use 'apt-get source ' instead of 'apt-get source ' because else downloading of 0ad* sources fails... --- bin/reproducible_build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/reproducible_build.sh b/bin/reproducible_build.sh index 1761f9a2..835fd802 100755 --- a/bin/reproducible_build.sh +++ b/bin/reproducible_build.sh @@ -60,7 +60,7 @@ else echo "The jenkins build log is/was available at $BUILD_URL/console" | tee -a ${RBUILDLOG} # host has only sid in deb-src in sources.list set +e - apt-get source --download-only --only-source ${SRCPACKAGE} >> ${RBUILDLOG} 2>&1 + apt-get --download-only --only-source source ${SRCPACKAGE} >> ${RBUILDLOG} 2>&1 RESULT=$? if [ $RESULT != 0 ] ; then # sometimes apt-get cannot download a package for whatever reason. -- cgit v1.2.3-70-g09d2 From 3f17d35c506bd7784f475708765493c1148609c0 Mon Sep 17 00:00:00 2001 From: Holger Levsen Date: Fri, 21 Nov 2014 14:10:35 +0100 Subject: reproducible: use bold font instead of underlines to indicate packages with notes --- bin/reproducible_common.sh | 2 +- userContent/static/style.css | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/bin/reproducible_common.sh b/bin/reproducible_common.sh index 6f1324d2..f90cd7fe 100755 --- a/bin/reproducible_common.sh +++ b/bin/reproducible_common.sh @@ -229,7 +229,7 @@ write_page_footer() { } write_page_meta_sign() { - write_page "

An underlined package is an indication that this package has a note. Visited packages are linked in green, those which have not been visited are linked in blue." + write_page "

A package name displayed with a bold font is an indication that this package has a note. Visited packages are linked in green, those which have not been visited are linked in blue." if $BUILDINFO_ON_PAGE ; then write_page "A β sign after a package which is unreproducible indicates that a .buildinfo file was generated." write_page "And that means the basics for building packages reproducibly are covered." diff --git a/userContent/static/style.css b/userContent/static/style.css index 1c836fd7..891aa131 100644 --- a/userContent/static/style.css +++ b/userContent/static/style.css @@ -47,7 +47,7 @@ a, a.package { a.noted { color:#0088cc; - text-decoration:underline; + font-weight: bold; } a:hover, a:focus, a.package:hover, a.package:focus { @@ -57,7 +57,8 @@ a:hover, a:focus, a.package:hover, a.package:focus { a.noted:hover, a.noted:focus { color:#005580; - text-decoration:none; + text-decoration:underline; + font-weight: bold; } a.package:visited, a.noted:visited { -- cgit v1.2.3-70-g09d2 From 5b9eb9f77d01a935c2a0f32eb36f48f74103037e Mon Sep 17 00:00:00 2001 From: Holger Levsen Date: Fri, 21 Nov 2014 19:50:34 +0100 Subject: reproducible: swap colors in bug graph --- bin/make_graph.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/make_graph.py b/bin/make_graph.py index ad0e34cc..99866fc5 100755 --- a/bin/make_graph.py +++ b/bin/make_graph.py @@ -31,10 +31,10 @@ def main(): if int(colors) < 10: r('palette(c("#4e9a06", "#f57900", "#cc0000", "#2e3436", "#888a85"))') else: - r('palette(c("#fce94f", "#c4a000", "#fcaf3e", "#ce5c00", \ + r('palette(c("#fce94f", "#c4a000", "#eeeeec", "#babdb6", \ + "#fcaf3e", "#ce5c00", "#ad7fa8", "#5c3566", \ "#e9b96e", "#8f5902", "#8ae234", "#4e9a06", \ - "#729fcf", "#204a87", "#ad7fa8", "#5c3566", \ - "#ef2929", "#a40000", "#eeeeec", "#babdb6", \ + "#729fcf", "#204a87", "#ef2929", "#a40000", \ "#888a85", "#2e3436"))') r('v <- t[0:nrow(t),0:'+colors+']') # make graph since day 1 -- cgit v1.2.3-70-g09d2 From 2d4012a0384fb3cded07572e499150aee363dd19 Mon Sep 17 00:00:00 2001 From: Samuel Thibault Date: Sat, 22 Nov 2014 20:21:04 +0100 Subject: g-i hurd,kfreebsd: Fix preseeding desktop choice --- d-i-preseed-cfgs/debian_sid_daily_hurd_lxde_preseed.cfg | 6 +----- d-i-preseed-cfgs/debian_sid_daily_kfreebsd_preseed.cfg | 6 +----- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/d-i-preseed-cfgs/debian_sid_daily_hurd_lxde_preseed.cfg b/d-i-preseed-cfgs/debian_sid_daily_hurd_lxde_preseed.cfg index 9cb53f7e..d20e7e7a 100644 --- a/d-i-preseed-cfgs/debian_sid_daily_hurd_lxde_preseed.cfg +++ b/d-i-preseed-cfgs/debian_sid_daily_hurd_lxde_preseed.cfg @@ -303,11 +303,7 @@ d-i partman/confirm_nooverwrite boolean true ### Package selection #tasksel tasksel/first multiselect standard, web-server -tasksel tasksel/first multiselect standard, desktop -# If the desktop task is selected, install the kde and xfce desktops -# instead of the default gnome desktop. -#tasksel tasksel/desktop multiselect kde, xfce -tasksel tasksel/desktop multiselect lxde +tasksel tasksel/first multiselect standard, lxde-desktop # Individual additional packages to install #d-i pkgsel/include string openssh-server build-essential diff --git a/d-i-preseed-cfgs/debian_sid_daily_kfreebsd_preseed.cfg b/d-i-preseed-cfgs/debian_sid_daily_kfreebsd_preseed.cfg index 9922d8b0..72bf5ad6 100644 --- a/d-i-preseed-cfgs/debian_sid_daily_kfreebsd_preseed.cfg +++ b/d-i-preseed-cfgs/debian_sid_daily_kfreebsd_preseed.cfg @@ -290,11 +290,7 @@ d-i partman/confirm_nooverwrite boolean true ### Package selection #tasksel tasksel/first multiselect standard, web-server -tasksel tasksel/first multiselect standard, desktop -# If the desktop task is selected, install the kde and xfce desktops -# instead of the default gnome desktop. -#tasksel tasksel/desktop multiselect kde, xfce -tasksel tasksel/desktop multiselect xfce +tasksel tasksel/first multiselect standard, xfce-desktop # Individual additional packages to install #d-i pkgsel/include string openssh-server build-essential -- cgit v1.2.3-70-g09d2 From 495eb3ebdc3c76fec773495ada8d4b473214aaf4 Mon Sep 17 00:00:00 2001 From: Holger Levsen Date: Sun, 23 Nov 2014 16:12:22 +0100 Subject: refactor --- bin/reproducible_common.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/bin/reproducible_common.sh b/bin/reproducible_common.sh index f90cd7fe..37fc6943 100755 --- a/bin/reproducible_common.sh +++ b/bin/reproducible_common.sh @@ -10,16 +10,16 @@ PACKAGES_DB=/var/lib/jenkins/reproducible.db INIT=/var/lib/jenkins/reproducible.init if [ -f $PACKAGES_DB ] && [ -f $INIT ] ; then - if [ -f $PACKAGES_DB.lock ] ; then + if [ -f ${PACKAGES_DB}.lock ] ; then for i in $(seq 0 100) ; do sleep 15 echo "sleeping 15s, $PACKAGES_DB is locked." - if [ ! -f $PACKAGES_DB.lock ] ; then + if [ ! -f ${PACKAGES_DB}.lock ] ; then break fi done - if [ -f $PACKAGES_DB.lock ] ; then - echo "$PACKAGES_DB.lock still exist, exiting." + if [ -f ${PACKAGES_DB}.lock ] ; then + echo "${PACKAGES_DB}.lock still exist, exiting." exit 1 fi fi @@ -95,7 +95,7 @@ elif [ ! -f ${PACKAGES_DB} ] ; then done_randomness INTEGER, PRIMARY KEY (datum))' # 60 seconds timeout when trying to get a lock - cat >/var/lib/jenkins/reproducible.init <<-EOF + cat > $INIT <<-EOF .timeout 60000 EOF fi -- cgit v1.2.3-70-g09d2 From c78d76d637c4697ae72780a439506f1a8dd8950e Mon Sep 17 00:00:00 2001 From: Holger Levsen Date: Sun, 23 Nov 2014 20:32:12 +0100 Subject: qa.d.o: add udd_orphaned_without_o_bug job, thanks to Johannes Schauer --- bin/udd-query.sh | 145 +++++++++++++++++++++++++++++++++++++------------------ job-cfg/udd.yaml | 18 +++++-- 2 files changed, 112 insertions(+), 51 deletions(-) diff --git a/bin/udd-query.sh b/bin/udd-query.sh index 2d8247e2..71efce71 100755 --- a/bin/udd-query.sh +++ b/bin/udd-query.sh @@ -1,64 +1,113 @@ #!/bin/bash # Copyright 2012-2014 Holger Levsen -# UDD query by Stuart Prescott +# multiarch_versionskew UDD query by Stuart Prescott +# orphaned_without_o_bug by Johannes Schauer # released under the GPLv=2 DEBUG=false . /srv/jenkins/bin/common-functions.sh common_init "$@" -# -# have all needed params been supplied? -# -if [ -z "$2" ] ; then - echo "Need at two params, distro + query_name..." - exit 1 -fi +udd_query() { + # + # Actually query UDD and save result in $UDD file + # + echo "$(date) - querying UDD using ${SQL_QUERY}" + echo + PGPASSWORD=public-udd-mirror \ + psql -U public-udd-mirror \ + -h public-udd-mirror.xvm.mit.edu -p 5432 \ + -t \ + udd -c"${SQL_QUERY}" > $UDD +} -DISTRO=$1 -declare -A SQL_QUERY -QUERY=$2 +multiarch_versionskew() { + if [ -z "$1" ] ; then + echo "Warning: no distro supplied, assuming sid." + DISTR=sid + else + DISTRO=$1 + fi + # + # SQL query for detecting multi-arch version skew + # + SQL_QUERY="SELECT DISTINCT source FROM + (SELECT DISTINCT source, package, version + FROM packages WHERE + release='$DISTRO' AND + multi_arch='same' AND + architecture IN ('amd64', 'arm64', 'armel', 'armhf', 'i386', + 'kfreebsd-amd64', 'kfreebsd-i386', 'mips', 'mipsel', + 'powerpc', 'ppc64el', 's390x') + ORDER BY source) AS all_versions + GROUP BY source, package + HAVING count(*) > 1 + ORDER BY source ;" -# -# more to come, hopefully -# -if [ "$QUERY" != "multiarch_versionskew" ] ; then - echo "unknown query requested, exiting... please provide patches :)" - exit 1 -fi + udd_query + cat $UDD + # TODO: turn source package names into links + # TODO: show versions (per arch) too + rm $UDD +} -# -# SQL query for detecting multi-arch version skew -# -SQL_QUERY["multiarch_versionskew"]=" - SELECT DISTINCT source FROM - (SELECT DISTINCT source, package, version - FROM packages - WHERE - release='$DISTRO' AND - multi_arch='same' AND - architecture IN ('amd64', 'arm64', 'armel', 'armhf', 'i386', - 'kfreebsd-amd64', 'kfreebsd-i386', 'mips', 'mipsel', - 'powerpc', 'ppc64el', 's390x') - ORDER BY source) AS all_versions - GROUP BY source, package - HAVING count(*) > 1 - ORDER BY source - ; -" +orphaned_without_o_bug() { + WNPPRM=$(mktemp) + SORTED_UDD=$(mktemp) + RES1=$(mktemp) + + SQL_QUERY="SELECT DISTINCT source + FROM sources + WHERE maintainer LIKE '%packages@qa.debian.org%' + AND release='sid' + ORDER BY source ; " + + udd_query + cat $UDD | tr -d ' ' | sort | uniq > "$SORTED_UDD" + curl --silent https://qa.debian.org/data/bts/wnpp_rm \ + | cut -d ' ' -f 1 | tr -d ':' | sort | uniq > "$WNPPRM" + + comm -23 "$SORTED_UDD" "$WNPPRM" > "$RES1" + + # $RES1 now contains all packages that have packages@qa.debian.org as the + # maintainer but do not appear on https://qa.debian.org/data/bts/wnpp_rm + # (because they are missing a bug) + # we have to remove all the packages that appear in experimental but do not + # have packages@qa.debian.org as a maintainer (i.e: they found a new one) + + SQL_QUERY="SELECT DISTINCT source + FROM sources + WHERE maintainer NOT LIKE '%packages@qa.debian.org%' + AND release='experimental' + ORDER BY source ; " + udd_query + cat $UDD | tr -d ' ' | sort | uniq > "$SORTED_UDD" + + echo "The following packages are maintained by packages@qa.debian.org" + echo "but are missing a wnpp bug according to https://qa.debian.org/data/bts/wnpp_rm" + echo + + comm -13 "$SORTED_UDD" "$RES1" + + rm -f "$UDD" "$WNPPRM" "$RES1" "$SORTED_UDD" + +} # -# Actually query UDD +# main # -echo "$(date) - querying UDD using ${SQL_QUERY[$QUERY]}" -echo -PGPASSWORD=public-udd-mirror \ - psql -U public-udd-mirror \ - -h public-udd-mirror.xvm.mit.edu -p 5432 \ - -t \ - udd -c"${SQL_QUERY[$QUERY]}" - -# TODO: turn source package names into links -# TODO: show versions (per arch) too +UDD=$(mktemp) +case QUERY in + orphaned_without_o_bug) + orphaned_without_o_bug + ;; + multiarch_versionskew) + multiarch_versionskew $2 + ;; + *) + echo "unknown query requested, exiting... please provide patches :)" + ;; +esac + diff --git a/job-cfg/udd.yaml b/job-cfg/udd.yaml index 932ac715..dfaf5547 100644 --- a/job-cfg/udd.yaml +++ b/job-cfg/udd.yaml @@ -40,19 +40,31 @@ defaults: udd name: '{name}_sid_multiarch_versionskew' +- job-template: + defaults: udd + name: '{name}_sid_multiarch_versionskew' + +- job-template: + defaults: udd + name: '{name}_orphaned_without_o_bug' + - project: name: udd jobs: - '{name}_wheezy_multiarch_versionskew': my_time: '2 8 1 * *' - my_params: 'wheezy multiarch_versionskew' + my_params: 'multiarch_versionskew wheezy' my_description: 'Detect multi-arch versions skews in wheezy.' - '{name}_jessie_multiarch_versionskew': my_time: '1 8 * * *' - my_params: 'jessie multiarch_versionskew' + my_params: 'multiarch_versionskew jessie' my_description: 'Detect multi-arch versions skews in jessie.' - '{name}_sid_multiarch_versionskew': my_time: '0 8 * * *' - my_params: 'sid multiarch_versionskew' + my_params: 'multiarch_versionskew sid' my_description: 'Detect multi-arch versions skews in sid.' + - '{name}_orphaned_without_o_bug': + my_time: '3 8 * * *' + my_params: 'orphaned_without_o_bug' + my_description: 'Detect orphaned packages with maintainer set to packages@qa.debian.org but without an "Orphaned" bug against the wnpp pseudo-package.' -- cgit v1.2.3-70-g09d2 From ec8f143d1ad66ed1af8609e76c144af06454afae Mon Sep 17 00:00:00 2001 From: Holger Levsen Date: Sun, 23 Nov 2014 20:43:48 +0100 Subject: qa.d.o: use logparse/debian.rules --- bin/udd-query.sh | 31 +++++++++++++++++-------------- job-cfg/udd.yaml | 4 ++++ 2 files changed, 21 insertions(+), 14 deletions(-) diff --git a/bin/udd-query.sh b/bin/udd-query.sh index 71efce71..9fde6f5a 100755 --- a/bin/udd-query.sh +++ b/bin/udd-query.sh @@ -46,9 +46,13 @@ multiarch_versionskew() { ORDER BY source ;" udd_query - cat $UDD - # TODO: turn source package names into links - # TODO: show versions (per arch) too + if [ -s $UDD ] ; then + echo "Warning: multi-arch version skew in $DISTRO detected." + echo + # TODO: turn source package names into links + # TODO: show versions (per arch) too + cat $UDD + fi rm $UDD } @@ -65,10 +69,8 @@ orphaned_without_o_bug() { udd_query cat $UDD | tr -d ' ' | sort | uniq > "$SORTED_UDD" - curl --silent https://qa.debian.org/data/bts/wnpp_rm \ | cut -d ' ' -f 1 | tr -d ':' | sort | uniq > "$WNPPRM" - comm -23 "$SORTED_UDD" "$WNPPRM" > "$RES1" # $RES1 now contains all packages that have packages@qa.debian.org as the @@ -76,30 +78,31 @@ orphaned_without_o_bug() { # (because they are missing a bug) # we have to remove all the packages that appear in experimental but do not # have packages@qa.debian.org as a maintainer (i.e: they found a new one) - SQL_QUERY="SELECT DISTINCT source FROM sources WHERE maintainer NOT LIKE '%packages@qa.debian.org%' AND release='experimental' ORDER BY source ; " udd_query - cat $UDD | tr -d ' ' | sort | uniq > "$SORTED_UDD" - echo "The following packages are maintained by packages@qa.debian.org" - echo "but are missing a wnpp bug according to https://qa.debian.org/data/bts/wnpp_rm" - echo + if [ -s $UDD ] ; then + cat $UDD | tr -d ' ' | sort | uniq > "$SORTED_UDD" - comm -13 "$SORTED_UDD" "$RES1" + echo "Warning: The following packages are maintained by packages@qa.debian.org" + echo "but are missing a wnpp bug according to https://qa.debian.org/data/bts/wnpp_rm" + echo + # TODO: turn source package names into links + comm -13 "$SORTED_UDD" "$RES1" + fi rm -f "$UDD" "$WNPPRM" "$RES1" "$SORTED_UDD" - } # # main # UDD=$(mktemp) -case QUERY in +case $1 in orphaned_without_o_bug) orphaned_without_o_bug ;; @@ -110,4 +113,4 @@ case QUERY in echo "unknown query requested, exiting... please provide patches :)" ;; esac - +echo diff --git a/job-cfg/udd.yaml b/job-cfg/udd.yaml index dfaf5547..49e6cc94 100644 --- a/job-cfg/udd.yaml +++ b/job-cfg/udd.yaml @@ -23,6 +23,10 @@ publishers: - email: recipients: 'jenkins+debian-qa holger@layer-acht.org' + - logparser: + parse-rules: '/srv/jenkins/logparse/debian.rules' + unstable-on-warning: 'true' + fail-on-error: 'true' builders: - shell: '/srv/jenkins/bin/udd-query.sh {my_params}' triggers: -- cgit v1.2.3-70-g09d2 From 3b2227dddaf8af2da6c955d23fbadaae5562bd6d Mon Sep 17 00:00:00 2001 From: Holger Levsen Date: Sun, 23 Nov 2014 23:46:38 +0100 Subject: g-i: add new job, g-i sid daily gnome (=no desktop preseeding) --- .../debian_sid_daily_gnome_preseed.cfg | 375 +++++++++++++++++++++ job-cfg/g-i-installation.yaml | 10 + 2 files changed, 385 insertions(+) create mode 100644 d-i-preseed-cfgs/debian_sid_daily_gnome_preseed.cfg diff --git a/d-i-preseed-cfgs/debian_sid_daily_gnome_preseed.cfg b/d-i-preseed-cfgs/debian_sid_daily_gnome_preseed.cfg new file mode 100644 index 00000000..4ed025a3 --- /dev/null +++ b/d-i-preseed-cfgs/debian_sid_daily_gnome_preseed.cfg @@ -0,0 +1,375 @@ +#### Contents of the preconfiguration file for Debian +### Localization +# Preseeding only locale sets language, country and locale. +d-i debian-installer/locale string en_US + +# The values can also be preseeded individually for greater flexibility. +#d-i debian-installer/language string en +#d-i debian-installer/country string NL +#d-i debian-installer/locale string en_GB.UTF-8 +# Optionally specify additional locales to be generated. +#d-i localechooser/supported-locales multiselect en_US.UTF-8, nl_NL.UTF-8 + +# Keyboard selection. +# keymap is an alias for keyboard-configuration/xkb-keymap +d-i keymap select us +# d-i keyboard-configuration/toggle select No toggling + +### Network configuration +# Disable network configuration entirely. This is useful for cdrom +# installations on non-networked devices where the network questions, +# warning and long timeouts are a nuisance. +#d-i netcfg/enable boolean false + +# netcfg will choose an interface that has link if possible. This makes it +# skip displaying a list if there is more than one interface. +d-i netcfg/choose_interface select auto + +# To pick a particular interface instead: +#d-i netcfg/choose_interface select eth1 + +# To set a different link detection timeout (default is 3 seconds). +# Values are interpreted as seconds. +#di netcfg/link_detection_timeout string 10 + +# If you have a slow dhcp server and the installer times out waiting for +# it, this might be useful. +#d-i netcfg/dhcp_timeout string 60 + +# If you prefer to configure the network manually, uncomment this line and +# the static network configuration below. +#d-i netcfg/disable_dhcp boolean true + +# If you want the preconfiguration file to work on systems both with and +# without a dhcp server, uncomment these lines and the static network +# configuration below. +#d-i netcfg/dhcp_failed note +#d-i netcfg/dhcp_options select Configure network manually + +# Static network configuration. +#d-i netcfg/get_nameservers string 192.168.1.1 +#d-i netcfg/get_ipaddress string 192.168.1.42 +#d-i netcfg/get_netmask string 255.255.255.0 +#d-i netcfg/get_gateway string 192.168.1.1 +#d-i netcfg/confirm_static boolean true + +# Any hostname and domain names assigned from dhcp take precedence over +# values set here. However, setting the values still prevents the questions +# from being shown, even if values come from dhcp. +d-i netcfg/get_hostname string unassigned-hostname +d-i netcfg/get_domain string unassigned-domain + +# Disable that annoying WEP key dialog. +d-i netcfg/wireless_wep string +# The wacky dhcp hostname that some ISPs use as a password of sorts. +#d-i netcfg/dhcp_hostname string radish + +# If non-free firmware is needed for the network or other hardware, you can +# configure the installer to always try to load it, without prompting. Or +# change to false to disable asking. +#d-i hw-detect/load_firmware boolean true + +### Network console +# Use the following settings if you wish to make use of the network-console +# component for remote installation over SSH. This only makes sense if you +# intend to perform the remainder of the installation manually. +#d-i anna/choose_modules string network-console +#d-i network-console/authorized_keys_url string http://10.0.0.1/openssh-key +#d-i network-console/password password r00tme +#d-i network-console/password-again password r00tme + +### Mirror settings +# If you select ftp, the mirror/country string does not need to be set. +#d-i mirror/protocol string ftp +d-i mirror/country string manual +d-i mirror/http/hostname string ftp.de.debian.org +d-i mirror/http/directory string /debian +d-i mirror/http/proxy string http://10.0.2.1:3128/ + +# Suite to install. +#d-i mirror/suite string testing +# Suite to use for loading installer components (optional). +#d-i mirror/udeb/suite string testing + +### Account setup +# Skip creation of a root account (normal user account will be able to +# use sudo). +#d-i passwd/root-login boolean false +# Alternatively, to skip creation of a normal user account. +#d-i passwd/make-user boolean false + +# Root password, either in clear text +d-i passwd/root-password password r00tme +d-i passwd/root-password-again password r00tme +# or encrypted using an MD5 hash. +#d-i passwd/root-password-crypted password [MD5 hash] + +# To create a normal user account. +d-i passwd/user-fullname string Jenkins Testuser +d-i passwd/username string jenkins +# Normal user's password, either in clear text +d-i passwd/user-password password insecure +d-i passwd/user-password-again password insecure +# or encrypted using an MD5 hash. +#d-i passwd/user-password-crypted password [MD5 hash] +# Create the first user with the specified UID instead of the default. +#d-i passwd/user-uid string 1010 + +# The user account will be added to some standard initial groups. To +# override that, use this. +#d-i passwd/user-default-groups string audio cdrom video + +### Clock and time zone setup +# Controls whether or not the hardware clock is set to UTC. +d-i clock-setup/utc boolean true + +# You may set this to any valid setting for $TZ; see the contents of +# /usr/share/zoneinfo/ for valid values. +d-i time/zone string US/Eastern + +# Controls whether to use NTP to set the clock during the install +d-i clock-setup/ntp boolean true +# NTP server to use. The default is almost always fine here. +#d-i clock-setup/ntp-server string ntp.example.com + +### Partitioning +## Partitioning example +# If the system has free space you can choose to only partition that space. +# This is only honoured if partman-auto/method (below) is not set. +#d-i partman-auto/init_automatically_partition select biggest_free + +# Alternatively, you may specify a disk to partition. If the system has only +# one disk the installer will default to using that, but otherwise the device +# name must be given in traditional, non-devfs format (so e.g. /dev/hda or +# /dev/sda, and not e.g. /dev/discs/disc0/disc). +# For example, to use the first SCSI/SATA hard disk: +#d-i partman-auto/disk string /dev/sda +# In addition, you'll need to specify the method to use. +# The presently available methods are: +# - regular: use the usual partition types for your architecture +# - lvm: use LVM to partition the disk +# - crypto: use LVM within an encrypted partition +d-i partman-auto/method string lvm + +# If one of the disks that are going to be automatically partitioned +# contains an old LVM configuration, the user will normally receive a +# warning. This can be preseeded away... +d-i partman-lvm/device_remove_lvm boolean true +# The same applies to pre-existing software RAID array: +d-i partman-md/device_remove_md boolean true +# And the same goes for the confirmation to write the lvm partitions. +d-i partman-lvm/confirm boolean true +d-i partman-lvm/confirm_nooverwrite boolean true + +# You can choose one of the three predefined partitioning recipes: +# - atomic: all files in one partition +# - home: separate /home partition +# - multi: separate /home, /usr, /var, and /tmp partitions +d-i partman-auto/choose_recipe select atomic + +# Or provide a recipe of your own... +# If you have a way to get a recipe file into the d-i environment, you can +# just point at it. +#d-i partman-auto/expert_recipe_file string /hd-media/recipe + +# If not, you can put an entire recipe into the preconfiguration file in one +# (logical) line. This example creates a small /boot partition, suitable +# swap, and uses the rest of the space for the root partition: +#d-i partman-auto/expert_recipe string \ +# boot-root :: \ +# 40 50 100 ext3 \ +# $primary{ } $bootable{ } \ +# method{ format } format{ } \ +# use_filesystem{ } filesystem{ ext3 } \ +# mountpoint{ /boot } \ +# . \ +# 500 10000 1000000000 ext3 \ +# method{ format } format{ } \ +# use_filesystem{ } filesystem{ ext3 } \ +# mountpoint{ / } \ +# . \ +# 64 512 300% linux-swap \ +# method{ swap } format{ } \ +# . + +# The full recipe format is documented in the file partman-auto-recipe.txt +# included in the 'debian-installer' package or available from D-I source +# repository. This also documents how to specify settings such as file +# system labels, volume group names and which physical devices to include +# in a volume group. + +# This makes partman automatically partition without confirmation, provided +# that you told it what to do using one of the methods above. +d-i partman-partitioning/confirm_write_new_label boolean true +d-i partman/choose_partition select finish +d-i partman/confirm boolean true +d-i partman/confirm_nooverwrite boolean true + +## Partitioning using RAID +# The method should be set to "raid". +#d-i partman-auto/method string raid +# Specify the disks to be partitioned. They will all get the same layout, +# so this will only work if the disks are the same size. +#d-i partman-auto/disk string /dev/sda /dev/sdb + +# Next you need to specify the physical partitions that will be used. +#d-i partman-auto/expert_recipe string \ +# multiraid :: \ +# 1000 5000 4000 raid \ +# $primary{ } method{ raid } \ +# . \ +# 64 512 300% raid \ +# method{ raid } \ +# . \ +# 500 10000 1000000000 raid \ +# method{ raid } \ +# . + +# Last you need to specify how the previously defined partitions will be +# used in the RAID setup. Remember to use the correct partition numbers +# for logical partitions. RAID levels 0, 1, 5, 6 and 10 are supported; +# devices are separated using "#". +# Parameters are: +# \ +# + +#d-i partman-auto-raid/recipe string \ +# 1 2 0 ext3 / \ +# /dev/sda1#/dev/sdb1 \ +# . \ +# 1 2 0 swap - \ +# /dev/sda5#/dev/sdb5 \ +# . \ +# 0 2 0 ext3 /home \ +# /dev/sda6#/dev/sdb6 \ +# . + +# For additional information see the file partman-auto-raid-recipe.txt +# included in the 'debian-installer' package or available from D-I source +# repository. + +# This makes partman automatically partition without confirmation. +d-i partman-md/confirm boolean true +d-i partman-partitioning/confirm_write_new_label boolean true +d-i partman/choose_partition select finish +d-i partman/confirm boolean true +d-i partman/confirm_nooverwrite boolean true + +## Controlling how partitions are mounted +# The default is to mount by UUID, but you can also choose "traditional" to +# use traditional device names, or "label" to try filesystem labels before +# falling back to UUIDs. +#d-i partman/mount_style select uuid + +### Base system installation +# Configure APT to not install recommended packages by default. Use of this +# option can result in an incomplete system and should only be used by very +# experienced users. +#d-i base-installer/install-recommends boolean false + +# The kernel image (meta) package to be installed; "none" can be used if no +# kernel is to be installed. +#d-i base-installer/kernel/image string linux-image-2.6-486 + +### Apt setup +# You can choose to install non-free and contrib software. +#d-i apt-setup/non-free boolean true +#d-i apt-setup/contrib boolean true +# Uncomment this if you don't want to use a network mirror. +#d-i apt-setup/use_mirror boolean false +# Select which update services to use; define the mirrors to be used. +# Values shown below are the normal defaults. +#d-i apt-setup/services-select multiselect security, volatile +#d-i apt-setup/security_host string security.debian.org +#d-i apt-setup/volatile_host string volatile.debian.org + +# Additional repositories, local[0-9] available +#d-i apt-setup/local0/repository string \ +# http://local.server/debian stable main +#d-i apt-setup/local0/comment string local server +# Enable deb-src lines +#d-i apt-setup/local0/source boolean true +# URL to the public key of the local repository; you must provide a key or +# apt will complain about the unauthenticated repository and so the +# sources.list line will be left commented out +#d-i apt-setup/local0/key string http://local.server/key + +# By default the installer requires that repositories be authenticated +# using a known gpg key. This setting can be used to disable that +# authentication. Warning: Insecure, not recommended. +#d-i debian-installer/allow_unauthenticated boolean true + +### Package selection +#tasksel tasksel/first multiselect standard, web-server +tasksel tasksel/first multiselect standard, desktop +# If the desktop task is selected, install the kde and xfce desktops +# instead of the default gnome desktop. +#tasksel tasksel/desktop multiselect kde, xfce + +# Individual additional packages to install +#d-i pkgsel/include string openssh-server build-essential +# Whether to upgrade packages after debootstrap. +# Allowed values: none, safe-upgrade, full-upgrade +#d-i pkgsel/upgrade select none + +# Some versions of the installer can report back on what software you have +# installed, and what software you use. The default is not to report back, +# but sending reports helps the project determine what software is most +# popular and include it on CDs. +#popularity-contest popularity-contest/participate boolean false + +# install grub on the first disk found +d-i grub-installer/bootdev string /dev/sda + +### Finishing up the installation +# During installations from serial console, the regular virtual consoles +# (VT1-VT6) are normally disabled in /etc/inittab. Uncomment the next +# line to prevent this. +#d-i finish-install/keep-consoles boolean true + +# Avoid that last message about the install being complete. +d-i finish-install/reboot_in_progress note + +# This will prevent the installer from ejecting the CD during the reboot, +# which is useful in some situations. +#d-i cdrom-detect/eject boolean false + +# This is how to make the installer shutdown when finished, but not +# reboot into the installed system. +#d-i debian-installer/exit/halt boolean true +# This will power off the machine instead of just halting it. +d-i debian-installer/exit/poweroff boolean true + +### Preseeding other packages +# Depending on what software you choose to install, or if things go wrong +# during the installation process, it's possible that other questions may +# be asked. You can preseed those too, of course. To get a list of every +# possible question that could be asked during an install, do an +# installation, and then run these commands: +# debconf-get-selections --installer > file +# debconf-get-selections >> file + + +#### Advanced options +### Running custom commands during the installation +# d-i preseeding is inherently not secure. Nothing in the installer checks +# for attempts at buffer overflows or other exploits of the values of a +# preconfiguration file like this one. Only use preconfiguration files from +# trusted locations! To drive that home, and because it's generally useful, +# here's a way to run any shell command you'd like inside the installer, +# automatically. + +# This first command is run as early as possible, just after +# preseeding is read. +#d-i preseed/early_command string anna-install some-udeb +# This command is run immediately before the partitioner starts. It may be +# useful to apply dynamic partitioner preseeding that depends on the state +# of the disks (which may not be visible when preseed/early_command runs). +#d-i partman/early_command \ +# string debconf-set partman-auto/disk "$(list-devices disk | head -n1)" +# This command is run just before the install finishes, but when there is +# still a usable /target directory. You can chroot to /target and use it +# directly, or use the apt-install and in-target commands to easily install +# packages and run commands in the target system. +#d-i preseed/late_command string apt-install zsh; in-target chsh -s /bin/zsh + diff --git a/job-cfg/g-i-installation.yaml b/job-cfg/g-i-installation.yaml index d6cbc8ce..196e9b20 100644 --- a/job-cfg/g-i-installation.yaml +++ b/job-cfg/g-i-installation.yaml @@ -161,6 +161,10 @@ defaults: g-i-installation name: '{name}_debian_wheezy_gnome' +- job-template: + defaults: g-i-installation + name: '{name}_debian_sid_daily_gnome' + - job-template: defaults: g-i-installation name: '{name}_debian_sid_daily_xfce' @@ -393,6 +397,12 @@ my_description: 'Do a fully automated installation of Debian GNOME desktop - via d-i preseeding (with this preseed.cfg) using netboot gtk.' my_timed: '42 19 */2 * *' my_recipients: 'holger@layer-acht.org' + - '{name}_debian_sid_daily_gnome': + my_title: 'Debian (sid daily build CD) GNOME desktop install' + my_shell: '/srv/jenkins/bin/g-i-installation.sh 10 http://cdimage.debian.org/cdimage/daily-builds/sid_d-i/arch-latest/amd64/iso-cd/debian-testing-amd64-netinst.iso' + my_description: 'Do a fully automated installation of Debian GNOME desktop - via d-i preseeding (with this preseed.cfg) using netboot gtk.' + my_timed: '42 8 * * *' + my_recipients: 'holger@layer-acht.org' - '{name}_debian_sid_daily_xfce': my_title: 'Debian (sid daily build CD) Xfce desktop install' my_shell: '/srv/jenkins/bin/g-i-installation.sh 10 http://cdimage.debian.org/cdimage/daily-builds/sid_d-i/arch-latest/amd64/iso-cd/debian-testing-amd64-netinst.iso' -- cgit v1.2.3-70-g09d2 From 7894b2ed0adc2e272ccf440b9b01a20eeb068371 Mon Sep 17 00:00:00 2001 From: Holger Levsen Date: Mon, 24 Nov 2014 00:19:24 +0100 Subject: g-i: add four new jobs: (sid_daily|jessie)_gnome_(brltty|speakup) --- bin/g-i-installation.sh | 22 ++++++++++++ .../debian_sid_daily_gnome_brltty_preseed.cfg | 1 + .../debian_sid_daily_gnome_speakup_preseed.cfg | 1 + job-cfg/g-i-installation.yaml | 40 ++++++++++++++++++++++ 4 files changed, 64 insertions(+) create mode 120000 d-i-preseed-cfgs/debian_sid_daily_gnome_brltty_preseed.cfg create mode 120000 d-i-preseed-cfgs/debian_sid_daily_gnome_speakup_preseed.cfg diff --git a/bin/g-i-installation.sh b/bin/g-i-installation.sh index 74355978..64cb4ade 100644 --- a/bin/g-i-installation.sh +++ b/bin/g-i-installation.sh @@ -301,6 +301,14 @@ bootstrap_system() { debian-edu_*) EXTRA_APPEND="$EXTRA_APPEND DEBCONF_DEBUG=developer" ;; + *_brltty) + EXTRA_APPEND="$EXTRA_APPEND brltty=tt,ttyS0,en" + ;; + *_speakup) + EXTRA_APPEND="$EXTRA_APPEND speakup.synth=soft" + ;; + *) + ;; esac case $NAME in debian-edu_*) @@ -1156,6 +1164,20 @@ save_logs() { # get list of installed packages # sudo chroot $SYSTEM_MNT dpkg -l > $RESULTS/dpkg-l || ( echo "Warning: cannot run dpkg inside the installed system, did the installation finish correctly?" ; export FAILURE=true ) + # + # check for must installed packages + # + case $NAME in + *_brltty) + grep brltty $RESULTS/dpkg-l || echo "Warning: package brltty not installed." + ;; + *_speakup) + grep epeakup RESULTS/dpkg-l || echo "Warning: package espeakup not installed." + ;; + *) + ;; + esac + # # only on combi-servers and ltsp-servers: # mount /opt diff --git a/d-i-preseed-cfgs/debian_sid_daily_gnome_brltty_preseed.cfg b/d-i-preseed-cfgs/debian_sid_daily_gnome_brltty_preseed.cfg new file mode 120000 index 00000000..75ef167c --- /dev/null +++ b/d-i-preseed-cfgs/debian_sid_daily_gnome_brltty_preseed.cfg @@ -0,0 +1 @@ +debian_sid_daily_gnome_preseed.cfg \ No newline at end of file diff --git a/d-i-preseed-cfgs/debian_sid_daily_gnome_speakup_preseed.cfg b/d-i-preseed-cfgs/debian_sid_daily_gnome_speakup_preseed.cfg new file mode 120000 index 00000000..75ef167c --- /dev/null +++ b/d-i-preseed-cfgs/debian_sid_daily_gnome_speakup_preseed.cfg @@ -0,0 +1 @@ +debian_sid_daily_gnome_preseed.cfg \ No newline at end of file diff --git a/job-cfg/g-i-installation.yaml b/job-cfg/g-i-installation.yaml index 196e9b20..3b5761ef 100644 --- a/job-cfg/g-i-installation.yaml +++ b/job-cfg/g-i-installation.yaml @@ -141,6 +141,14 @@ defaults: g-i-installation name: '{name}_debian_jessie_gnome' +- job-template: + defaults: g-i-installation + name: '{name}_debian_jessie_gnome_brltty' + +- job-template: + defaults: g-i-installation + name: '{name}_debian_jessie_gnome_speakup' + - job-template: defaults: g-i-installation name: '{name}_debian_wheezy_xfce' @@ -165,6 +173,14 @@ defaults: g-i-installation name: '{name}_debian_sid_daily_gnome' +- job-template: + defaults: g-i-installation + name: '{name}_debian_sid_daily_gnome_brltty' + +- job-template: + defaults: g-i-installation + name: '{name}_debian_sid_daily_gnome_speakup' + - job-template: defaults: g-i-installation name: '{name}_debian_sid_daily_xfce' @@ -397,12 +413,36 @@ my_description: 'Do a fully automated installation of Debian GNOME desktop - via d-i preseeding (with this preseed.cfg) using netboot gtk.' my_timed: '42 19 */2 * *' my_recipients: 'holger@layer-acht.org' + - '{name}_debian_jessie_gnome_brltty': + my_title: 'Debian (jessie) GNOME desktop install with braille display support' + my_shell: '/srv/jenkins/bin/g-i-installation.sh 10 http://d-i.debian.org/daily-images/amd64/daily/netboot/gtk/debian-installer/amd64/' + my_description: 'Do a fully automated installation of Debian GNOME desktop with braille display support - via d-i preseeding (with this preseed.cfg) using netboot gtk.' + my_timed: '43 19 */2 * *' # FIXME: trigger after _gnome + my_recipients: 'holger@layer-acht.org debian-accessibility@lists.debian.org' + - '{name}_debian_jessie_gnome_speakup': + my_title: 'Debian (jessie) GNOME desktop install with Speakup support' + my_shell: '/srv/jenkins/bin/g-i-installation.sh 10 http://d-i.debian.org/daily-images/amd64/daily/netboot/gtk/debian-installer/amd64/' + my_description: 'Do a fully automated installation of Debian GNOME desktop with Speakup support - via d-i preseeding (with this preseed.cfg) using netboot gtk.' + my_timed: '43 19 */2 * *' # FIXME: trigger after _gnome + my_recipients: 'holger@layer-acht.org debian-accessibility@lists.debian.org' - '{name}_debian_sid_daily_gnome': my_title: 'Debian (sid daily build CD) GNOME desktop install' my_shell: '/srv/jenkins/bin/g-i-installation.sh 10 http://cdimage.debian.org/cdimage/daily-builds/sid_d-i/arch-latest/amd64/iso-cd/debian-testing-amd64-netinst.iso' my_description: 'Do a fully automated installation of Debian GNOME desktop - via d-i preseeding (with this preseed.cfg) using netboot gtk.' my_timed: '42 8 * * *' my_recipients: 'holger@layer-acht.org' + - '{name}_debian_sid_daily_gnome_brltty': + my_title: 'Debian (sid daily build CD) GNOME desktop install with braille display support' + my_shell: '/srv/jenkins/bin/g-i-installation.sh 10 http://cdimage.debian.org/cdimage/daily-builds/sid_d-i/arch-latest/amd64/iso-cd/debian-testing-amd64-netinst.iso' + my_description: 'Do a fully automated installation of Debian GNOME desktop with braille display support - via d-i preseeding (with this preseed.cfg) using netboot gtk.' + my_timed: '43 8 * * *' # FIXME: trigger after _gnome + my_recipients: 'holger@layer-acht.org debian-accessibility@lists.debian.org' + - '{name}_debian_sid_daily_gnome_speakup': + my_title: 'Debian (sid daily build CD) GNOME desktop install with Speakup support' + my_shell: '/srv/jenkins/bin/g-i-installation.sh 10 http://cdimage.debian.org/cdimage/daily-builds/sid_d-i/arch-latest/amd64/iso-cd/debian-testing-amd64-netinst.iso' + my_description: 'Do a fully automated installation of Debian GNOME desktop with Speakup support - via d-i preseeding (with this preseed.cfg) using netboot gtk.' + my_timed: '43 8 * * *' # FIXME: trigger after _gnome + my_recipients: 'holger@layer-acht.org debian-accessibility@lists.debian.org' - '{name}_debian_sid_daily_xfce': my_title: 'Debian (sid daily build CD) Xfce desktop install' my_shell: '/srv/jenkins/bin/g-i-installation.sh 10 http://cdimage.debian.org/cdimage/daily-builds/sid_d-i/arch-latest/amd64/iso-cd/debian-testing-amd64-netinst.iso' -- cgit v1.2.3-70-g09d2 From a11c9790c9983b14ddf8ec41a27f51f1a0f2f915 Mon Sep 17 00:00:00 2001 From: Holger Levsen Date: Mon, 24 Nov 2014 00:25:10 +0100 Subject: add jessie preseed files for brltty and speakup, use default desktop for jessie (all) gnome preseed files --- d-i-preseed-cfgs/debian_jessie_gnome_brltty_preseed.cfg | 1 + d-i-preseed-cfgs/debian_jessie_gnome_preseed.cfg | 2 -- d-i-preseed-cfgs/debian_jessie_gnome_speakup_preseed.cfg | 1 + 3 files changed, 2 insertions(+), 2 deletions(-) create mode 120000 d-i-preseed-cfgs/debian_jessie_gnome_brltty_preseed.cfg create mode 120000 d-i-preseed-cfgs/debian_jessie_gnome_speakup_preseed.cfg diff --git a/d-i-preseed-cfgs/debian_jessie_gnome_brltty_preseed.cfg b/d-i-preseed-cfgs/debian_jessie_gnome_brltty_preseed.cfg new file mode 120000 index 00000000..637ddfff --- /dev/null +++ b/d-i-preseed-cfgs/debian_jessie_gnome_brltty_preseed.cfg @@ -0,0 +1 @@ +debian_jessie_gnome_preseed.cfg \ No newline at end of file diff --git a/d-i-preseed-cfgs/debian_jessie_gnome_preseed.cfg b/d-i-preseed-cfgs/debian_jessie_gnome_preseed.cfg index bd6819d5..4ed025a3 100644 --- a/d-i-preseed-cfgs/debian_jessie_gnome_preseed.cfg +++ b/d-i-preseed-cfgs/debian_jessie_gnome_preseed.cfg @@ -305,8 +305,6 @@ tasksel tasksel/first multiselect standard, desktop # If the desktop task is selected, install the kde and xfce desktops # instead of the default gnome desktop. #tasksel tasksel/desktop multiselect kde, xfce -#tasksel tasksel/desktop multiselect kde -tasksel tasksel/desktop multiselect gnome # Individual additional packages to install #d-i pkgsel/include string openssh-server build-essential diff --git a/d-i-preseed-cfgs/debian_jessie_gnome_speakup_preseed.cfg b/d-i-preseed-cfgs/debian_jessie_gnome_speakup_preseed.cfg new file mode 120000 index 00000000..637ddfff --- /dev/null +++ b/d-i-preseed-cfgs/debian_jessie_gnome_speakup_preseed.cfg @@ -0,0 +1 @@ +debian_jessie_gnome_preseed.cfg \ No newline at end of file -- cgit v1.2.3-70-g09d2 From 9629a0d350077b0d02876e033d6c5f7a8c66ad16 Mon Sep 17 00:00:00 2001 From: Holger Levsen Date: Mon, 24 Nov 2014 00:33:53 +0100 Subject: fixup links. currently the files are identical, but who knows --- job-cfg/g-i-installation.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/job-cfg/g-i-installation.yaml b/job-cfg/g-i-installation.yaml index 3b5761ef..8c4386ac 100644 --- a/job-cfg/g-i-installation.yaml +++ b/job-cfg/g-i-installation.yaml @@ -416,13 +416,13 @@ - '{name}_debian_jessie_gnome_brltty': my_title: 'Debian (jessie) GNOME desktop install with braille display support' my_shell: '/srv/jenkins/bin/g-i-installation.sh 10 http://d-i.debian.org/daily-images/amd64/daily/netboot/gtk/debian-installer/amd64/' - my_description: 'Do a fully automated installation of Debian GNOME desktop with braille display support - via d-i preseeding (with this preseed.cfg) using netboot gtk.' + my_description: 'Do a fully automated installation of Debian GNOME desktop with braille display support - via d-i preseeding (with this preseed.cfg) using netboot gtk.' my_timed: '43 19 */2 * *' # FIXME: trigger after _gnome my_recipients: 'holger@layer-acht.org debian-accessibility@lists.debian.org' - '{name}_debian_jessie_gnome_speakup': my_title: 'Debian (jessie) GNOME desktop install with Speakup support' my_shell: '/srv/jenkins/bin/g-i-installation.sh 10 http://d-i.debian.org/daily-images/amd64/daily/netboot/gtk/debian-installer/amd64/' - my_description: 'Do a fully automated installation of Debian GNOME desktop with Speakup support - via d-i preseeding (with this preseed.cfg) using netboot gtk.' + my_description: 'Do a fully automated installation of Debian GNOME desktop with Speakup support - via d-i preseeding (with this preseed.cfg) using netboot gtk.' my_timed: '43 19 */2 * *' # FIXME: trigger after _gnome my_recipients: 'holger@layer-acht.org debian-accessibility@lists.debian.org' - '{name}_debian_sid_daily_gnome': @@ -434,13 +434,13 @@ - '{name}_debian_sid_daily_gnome_brltty': my_title: 'Debian (sid daily build CD) GNOME desktop install with braille display support' my_shell: '/srv/jenkins/bin/g-i-installation.sh 10 http://cdimage.debian.org/cdimage/daily-builds/sid_d-i/arch-latest/amd64/iso-cd/debian-testing-amd64-netinst.iso' - my_description: 'Do a fully automated installation of Debian GNOME desktop with braille display support - via d-i preseeding (with this preseed.cfg) using netboot gtk.' + my_description: 'Do a fully automated installation of Debian GNOME desktop with braille display support - via d-i preseeding (with this preseed.cfg) using netboot gtk.' my_timed: '43 8 * * *' # FIXME: trigger after _gnome my_recipients: 'holger@layer-acht.org debian-accessibility@lists.debian.org' - '{name}_debian_sid_daily_gnome_speakup': my_title: 'Debian (sid daily build CD) GNOME desktop install with Speakup support' my_shell: '/srv/jenkins/bin/g-i-installation.sh 10 http://cdimage.debian.org/cdimage/daily-builds/sid_d-i/arch-latest/amd64/iso-cd/debian-testing-amd64-netinst.iso' - my_description: 'Do a fully automated installation of Debian GNOME desktop with Speakup support - via d-i preseeding (with this preseed.cfg) using netboot gtk.' + my_description: 'Do a fully automated installation of Debian GNOME desktop with Speakup support - via d-i preseeding (with this preseed.cfg) using netboot gtk.' my_timed: '43 8 * * *' # FIXME: trigger after _gnome my_recipients: 'holger@layer-acht.org debian-accessibility@lists.debian.org' - '{name}_debian_sid_daily_xfce': -- cgit v1.2.3-70-g09d2 From f63b04ac77fac16d4c223f72eaa4465159eb68de Mon Sep 17 00:00:00 2001 From: Holger Levsen Date: Mon, 24 Nov 2014 00:56:02 +0100 Subject: g-i: add three new jobs: (sid_daily|jessie|wheezy)_presentation - Thanks to Phil Hands and Frans Pop --- bin/g-i-installation.sh | 28 +- .../debian_jessie_presentation_preseed.cfg | 1 + .../debian_sid_daily_presentation_preseed.cfg | 372 +++++++++++++++++++++ .../debian_wheezy_presentation_preseed.cfg | 1 + job-cfg/g-i-installation.yaml | 30 ++ 5 files changed, 429 insertions(+), 3 deletions(-) create mode 120000 d-i-preseed-cfgs/debian_jessie_presentation_preseed.cfg create mode 100644 d-i-preseed-cfgs/debian_sid_daily_presentation_preseed.cfg create mode 120000 d-i-preseed-cfgs/debian_wheezy_presentation_preseed.cfg diff --git a/bin/g-i-installation.sh b/bin/g-i-installation.sh index 64cb4ade..a33725fa 100644 --- a/bin/g-i-installation.sh +++ b/bin/g-i-installation.sh @@ -124,7 +124,7 @@ cleanup_all() { # save logs if there are any # case $NAME in - *_rescue*) ;; + *_rescue*|*_presentation) ;; *) if [ $NR -gt 200 ] ; then save_logs else @@ -307,6 +307,9 @@ bootstrap_system() { *_speakup) EXTRA_APPEND="$EXTRA_APPEND speakup.synth=soft" ;; + *_presentation) + EXTRA_APPEND="$EXTRA_APPEND url=hands.com classes=talks/fosdem07" + ;; *) ;; esac @@ -442,6 +445,21 @@ rescue_boot() { esac } +presentation_boot() { + # boot in presentation mode + let MY_NR=NR-TRIGGER_NR + TOKEN=$(printf "%04d" $MY_NR) + case $TOKEN in + #0010) do_and_report key tab + # ;; + #0020) do_and_report key enter + # ;; + #0100) do_and_report key tab + # ;; + *) ;; + esac +} + post_install_boot() { # normal boot after installation let MY_NR=NR-TRIGGER_NR @@ -1119,6 +1137,8 @@ monitor_system() { case $MODE in rescue) rescue_boot ;; + presentation) presentation_boot + ;; post_install) post_install_boot ;; *) ;; @@ -1273,7 +1293,9 @@ fi bootstrap_system set +x case $NAME in - *_rescue*) monitor_system rescue + *_rescue*) monitor_system rescue + ;; + *_presentation) monitor_system presentation ;; debian-edu_*combi-server) monitor_system install wait4match 3000 ;; @@ -1287,7 +1309,7 @@ esac # let NR=NR+1 case $NAME in - *_rescue*) # so there are some artifacts to publish + *_rescue*|*_presentation) # so there are some artifacts to publish mkdir -p $RESULTS/log/installer touch $RESULTS/log/dummy $RESULTS/log/installer/dummy ;; diff --git a/d-i-preseed-cfgs/debian_jessie_presentation_preseed.cfg b/d-i-preseed-cfgs/debian_jessie_presentation_preseed.cfg new file mode 120000 index 00000000..d970a195 --- /dev/null +++ b/d-i-preseed-cfgs/debian_jessie_presentation_preseed.cfg @@ -0,0 +1 @@ +debian_sid_daily_presentation_preseed.cfg \ No newline at end of file diff --git a/d-i-preseed-cfgs/debian_sid_daily_presentation_preseed.cfg b/d-i-preseed-cfgs/debian_sid_daily_presentation_preseed.cfg new file mode 100644 index 00000000..6a8b7a36 --- /dev/null +++ b/d-i-preseed-cfgs/debian_sid_daily_presentation_preseed.cfg @@ -0,0 +1,372 @@ +#### Contents of the preconfiguration file for Debian +### Localization +# Preseeding only locale sets language, country and locale. +d-i debian-installer/locale string en_US + +# The values can also be preseeded individually for greater flexibility. +#d-i debian-installer/language string en +#d-i debian-installer/country string NL +#d-i debian-installer/locale string en_GB.UTF-8 +# Optionally specify additional locales to be generated. +#d-i localechooser/supported-locales multiselect en_US.UTF-8, nl_NL.UTF-8 + +# Keyboard selection. +# keymap is an alias for keyboard-configuration/xkb-keymap +d-i keymap select us +# d-i keyboard-configuration/toggle select No toggling + +### Network configuration +# Disable network configuration entirely. This is useful for cdrom +# installations on non-networked devices where the network questions, +# warning and long timeouts are a nuisance. +#d-i netcfg/enable boolean false + +# netcfg will choose an interface that has link if possible. This makes it +# skip displaying a list if there is more than one interface. +d-i netcfg/choose_interface select auto + +# To pick a particular interface instead: +#d-i netcfg/choose_interface select eth1 + +# To set a different link detection timeout (default is 3 seconds). +# Values are interpreted as seconds. +#di netcfg/link_detection_timeout string 10 + +# If you have a slow dhcp server and the installer times out waiting for +# it, this might be useful. +#d-i netcfg/dhcp_timeout string 60 + +# If you prefer to configure the network manually, uncomment this line and +# the static network configuration below. +#d-i netcfg/disable_dhcp boolean true + +# If you want the preconfiguration file to work on systems both with and +# without a dhcp server, uncomment these lines and the static network +# configuration below. +#d-i netcfg/dhcp_failed note +#d-i netcfg/dhcp_options select Configure network manually + +# Static network configuration. +#d-i netcfg/get_nameservers string 192.168.1.1 +#d-i netcfg/get_ipaddress string 192.168.1.42 +#d-i netcfg/get_netmask string 255.255.255.0 +#d-i netcfg/get_gateway string 192.168.1.1 +#d-i netcfg/confirm_static boolean true + +# Any hostname and domain names assigned from dhcp take precedence over +# values set here. However, setting the values still prevents the questions +# from being shown, even if values come from dhcp. +d-i netcfg/get_hostname string unassigned-hostname +d-i netcfg/get_domain string unassigned-domain + +# Disable that annoying WEP key dialog. +d-i netcfg/wireless_wep string +# The wacky dhcp hostname that some ISPs use as a password of sorts. +#d-i netcfg/dhcp_hostname string radish + +# If non-free firmware is needed for the network or other hardware, you can +# configure the installer to always try to load it, without prompting. Or +# change to false to disable asking. +#d-i hw-detect/load_firmware boolean true + +### Network console +# Use the following settings if you wish to make use of the network-console +# component for remote installation over SSH. This only makes sense if you +# intend to perform the remainder of the installation manually. +#d-i anna/choose_modules string network-console +#d-i network-console/authorized_keys_url string http://10.0.0.1/openssh-key +#d-i network-console/password password r00tme +#d-i network-console/password-again password r00tme + +### Mirror settings +# If you select ftp, the mirror/country string does not need to be set. +#d-i mirror/protocol string ftp +d-i mirror/country string manual +d-i mirror/http/hostname string ftp.de.debian.org +d-i mirror/http/directory string /debian +d-i mirror/http/proxy string http://10.0.2.1:3128/ + +# Suite to install. +#d-i mirror/suite string testing +# Suite to use for loading installer components (optional). +#d-i mirror/udeb/suite string testing + +### Account setup +# Skip creation of a root account (normal user account will be able to +# use sudo). +#d-i passwd/root-login boolean false +# Alternatively, to skip creation of a normal user account. +#d-i passwd/make-user boolean false + +# Root password, either in clear text +d-i passwd/root-password password r00tme +d-i passwd/root-password-again password r00tme +# or encrypted using an MD5 hash. +#d-i passwd/root-password-crypted password [MD5 hash] + +# To create a normal user account. +d-i passwd/user-fullname string Jenkins Testuser +d-i passwd/username string jenkins +# Normal user's password, either in clear text +d-i passwd/user-password password insecure +d-i passwd/user-password-again password insecure +# or encrypted using an MD5 hash. +#d-i passwd/user-password-crypted password [MD5 hash] +# Create the first user with the specified UID instead of the default. +#d-i passwd/user-uid string 1010 + +# The user account will be added to some standard initial groups. To +# override that, use this. +#d-i passwd/user-default-groups string audio cdrom video + +### Clock and time zone setup +# Controls whether or not the hardware clock is set to UTC. +d-i clock-setup/utc boolean true + +# You may set this to any valid setting for $TZ; see the contents of +# /usr/share/zoneinfo/ for valid values. +d-i time/zone string US/Eastern + +# Controls whether to use NTP to set the clock during the install +d-i clock-setup/ntp boolean true +# NTP server to use. The default is almost always fine here. +#d-i clock-setup/ntp-server string ntp.example.com + +### Partitioning +## Partitioning example +# If the system has free space you can choose to only partition that space. +# This is only honoured if partman-auto/method (below) is not set. +#d-i partman-auto/init_automatically_partition select biggest_free + +# Alternatively, you may specify a disk to partition. If the system has only +# one disk the installer will default to using that, but otherwise the device +# name must be given in traditional, non-devfs format (so e.g. /dev/hda or +# /dev/sda, and not e.g. /dev/discs/disc0/disc). +# For example, to use the first SCSI/SATA hard disk: +#d-i partman-auto/disk string /dev/sda +# In addition, you'll need to specify the method to use. +# The presently available methods are: +# - regular: use the usual partition types for your architecture +# - lvm: use LVM to partition the disk +# - crypto: use LVM within an encrypted partition +d-i partman-auto/method string lvm + +# If one of the disks that are going to be automatically partitioned +# contains an old LVM configuration, the user will normally receive a +# warning. This can be preseeded away... +d-i partman-lvm/device_remove_lvm boolean true +# The same applies to pre-existing software RAID array: +d-i partman-md/device_remove_md boolean true +# And the same goes for the confirmation to write the lvm partitions. +d-i partman-lvm/confirm boolean true +d-i partman-lvm/confirm_nooverwrite boolean true + +# You can choose one of the three predefined partitioning recipes: +# - atomic: all files in one partition +# - home: separate /home partition +# - multi: separate /home, /usr, /var, and /tmp partitions +d-i partman-auto/choose_recipe select atomic + +# Or provide a recipe of your own... +# If you have a way to get a recipe file into the d-i environment, you can +# just point at it. +#d-i partman-auto/expert_recipe_file string /hd-media/recipe + +# If not, you can put an entire recipe into the preconfiguration file in one +# (logical) line. This example creates a small /boot partition, suitable +# swap, and uses the rest of the space for the root partition: +#d-i partman-auto/expert_recipe string \ +# boot-root :: \ +# 40 50 100 ext3 \ +# $primary{ } $bootable{ } \ +# method{ format } format{ } \ +# use_filesystem{ } filesystem{ ext3 } \ +# mountpoint{ /boot } \ +# . \ +# 500 10000 1000000000 ext3 \ +# method{ format } format{ } \ +# use_filesystem{ } filesystem{ ext3 } \ +# mountpoint{ / } \ +# . \ +# 64 512 300% linux-swap \ +# method{ swap } format{ } \ +# . + +# The full recipe format is documented in the file partman-auto-recipe.txt +# included in the 'debian-installer' package or available from D-I source +# repository. This also documents how to specify settings such as file +# system labels, volume group names and which physical devices to include +# in a volume group. + +# This makes partman automatically partition without confirmation, provided +# that you told it what to do using one of the methods above. +d-i partman-partitioning/confirm_write_new_label boolean true +d-i partman/choose_partition select finish +d-i partman/confirm boolean true +d-i partman/confirm_nooverwrite boolean true + +## Partitioning using RAID +# The method should be set to "raid". +#d-i partman-auto/method string raid +# Specify the disks to be partitioned. They will all get the same layout, +# so this will only work if the disks are the same size. +#d-i partman-auto/disk string /dev/sda /dev/sdb + +# Next you need to specify the physical partitions that will be used. +#d-i partman-auto/expert_recipe string \ +# multiraid :: \ +# 1000 5000 4000 raid \ +# $primary{ } method{ raid } \ +# . \ +# 64 512 300% raid \ +# method{ raid } \ +# . \ +# 500 10000 1000000000 raid \ +# method{ raid } \ +# . + +# Last you need to specify how the previously defined partitions will be +# used in the RAID setup. Remember to use the correct partition numbers +# for logical partitions. RAID levels 0, 1, 5, 6 and 10 are supported; +# devices are separated using "#". +# Parameters are: +# \ +# + +#d-i partman-auto-raid/recipe string \ +# 1 2 0 ext3 / \ +# /dev/sda1#/dev/sdb1 \ +# . \ +# 1 2 0 swap - \ +# /dev/sda5#/dev/sdb5 \ +# . \ +# 0 2 0 ext3 /home \ +# /dev/sda6#/dev/sdb6 \ +# . + +# For additional information see the file partman-auto-raid-recipe.txt +# included in the 'debian-installer' package or available from D-I source +# repository. + +# This makes partman automatically partition without confirmation. +d-i partman-md/confirm boolean true +d-i partman-partitioning/confirm_write_new_label boolean true +d-i partman/choose_partition select finish +d-i partman/confirm boolean true +d-i partman/confirm_nooverwrite boolean true + +## Controlling how partitions are mounted +# The default is to mount by UUID, but you can also choose "traditional" to +# use traditional device names, or "label" to try filesystem labels before +# falling back to UUIDs. +#d-i partman/mount_style select uuid + +### Base system installation +# Configure APT to not install recommended packages by default. Use of this +# option can result in an incomplete system and should only be used by very +# experienced users. +#d-i base-installer/install-recommends boolean false + +# The kernel image (meta) package to be installed; "none" can be used if no +# kernel is to be installed. +#d-i base-installer/kernel/image string linux-image-2.6-486 + +### Apt setup +# You can choose to install non-free and contrib software. +#d-i apt-setup/non-free boolean true +#d-i apt-setup/contrib boolean true +# Uncomment this if you don't want to use a network mirror. +#d-i apt-setup/use_mirror boolean false +# Select which update services to use; define the mirrors to be used. +# Values shown below are the normal defaults. +#d-i apt-setup/services-select multiselect security, volatile +#d-i apt-setup/security_host string security.debian.org +#d-i apt-setup/volatile_host string volatile.debian.org + +# Additional repositories, local[0-9] available +#d-i apt-setup/local0/repository string \ +# http://local.server/debian stable main +#d-i apt-setup/local0/comment string local server +# Enable deb-src lines +#d-i apt-setup/local0/source boolean true +# URL to the public key of the local repository; you must provide a key or +# apt will complain about the unauthenticated repository and so the +# sources.list line will be left commented out +#d-i apt-setup/local0/key string http://local.server/key + +# By default the installer requires that repositories be authenticated +# using a known gpg key. This setting can be used to disable that +# authentication. Warning: Insecure, not recommended. +#d-i debian-installer/allow_unauthenticated boolean true + +### Package selection +#tasksel tasksel/first multiselect standard, web-server +tasksel tasksel/first multiselect standard, desktop +# If the desktop task is selected, install the kde and xfce desktops +# instead of the default gnome desktop. +#tasksel tasksel/desktop multiselect kde, xfce + +# Individual additional packages to install +#d-i pkgsel/include string openssh-server build-essential +# Whether to upgrade packages after debootstrap. +# Allowed values: none, safe-upgrade, full-upgrade +#d-i pkgsel/upgrade select none + +# Some versions of the installer can report back on what software you have +# installed, and what software you use. The default is not to report back, +# but sending reports helps the project determine what software is most +# popular and include it on CDs. +#popularity-contest popularity-contest/participate boolean false + +### Finishing up the installation +# During installations from serial console, the regular virtual consoles +# (VT1-VT6) are normally disabled in /etc/inittab. Uncomment the next +# line to prevent this. +#d-i finish-install/keep-consoles boolean true + +# Avoid that last message about the install being complete. +d-i finish-install/reboot_in_progress note + +# This will prevent the installer from ejecting the CD during the reboot, +# which is useful in some situations. +#d-i cdrom-detect/eject boolean false + +# This is how to make the installer shutdown when finished, but not +# reboot into the installed system. +#d-i debian-installer/exit/halt boolean true +# This will power off the machine instead of just halting it. +d-i debian-installer/exit/poweroff boolean true + +### Preseeding other packages +# Depending on what software you choose to install, or if things go wrong +# during the installation process, it's possible that other questions may +# be asked. You can preseed those too, of course. To get a list of every +# possible question that could be asked during an install, do an +# installation, and then run these commands: +# debconf-get-selections --installer > file +# debconf-get-selections >> file + + +#### Advanced options +### Running custom commands during the installation +# d-i preseeding is inherently not secure. Nothing in the installer checks +# for attempts at buffer overflows or other exploits of the values of a +# preconfiguration file like this one. Only use preconfiguration files from +# trusted locations! To drive that home, and because it's generally useful, +# here's a way to run any shell command you'd like inside the installer, +# automatically. + +# This first command is run as early as possible, just after +# preseeding is read. +#d-i preseed/early_command string anna-install some-udeb +# This command is run immediately before the partitioner starts. It may be +# useful to apply dynamic partitioner preseeding that depends on the state +# of the disks (which may not be visible when preseed/early_command runs). +#d-i partman/early_command \ +# string debconf-set partman-auto/disk "$(list-devices disk | head -n1)" +# This command is run just before the install finishes, but when there is +# still a usable /target directory. You can chroot to /target and use it +# directly, or use the apt-install and in-target commands to easily install +# packages and run commands in the target system. +#d-i preseed/late_command string apt-install zsh; in-target chsh -s /bin/zsh + diff --git a/d-i-preseed-cfgs/debian_wheezy_presentation_preseed.cfg b/d-i-preseed-cfgs/debian_wheezy_presentation_preseed.cfg new file mode 120000 index 00000000..d970a195 --- /dev/null +++ b/d-i-preseed-cfgs/debian_wheezy_presentation_preseed.cfg @@ -0,0 +1 @@ +debian_sid_daily_presentation_preseed.cfg \ No newline at end of file diff --git a/job-cfg/g-i-installation.yaml b/job-cfg/g-i-installation.yaml index 8c4386ac..d6295bb3 100644 --- a/job-cfg/g-i-installation.yaml +++ b/job-cfg/g-i-installation.yaml @@ -277,6 +277,18 @@ defaults: g-i-installation name: '{name}_debian_sid_daily_rescue_dark_theme' +- job-template: + defaults: g-i-installation + name: '{name}_debian_sid_daily_presentation' + +- job-template: + defaults: g-i-installation + name: '{name}_debian_jessie_presentation' + +- job-template: + defaults: g-i-installation + name: '{name}_debian_wheezy_presentation' + - job-template: defaults: g-i-installation name: '{name}_debian-edu_wheezy-test_standalone_gnome' @@ -474,6 +486,24 @@ my_description: 'Just go into rescue mode via d-i preseeding (with this preseed.cfg) using netboot gtk.' my_timed: '42 6 * * *' my_recipients: 'holger@layer-acht.org' + - '{name}_debian_sid_daily_presentation': + my_title: 'Debian-Installer (sid daily build CD) used for presentations' + my_shell: '/srv/jenkins/bin/g-i-installation.sh 1 http://cdimage.debian.org/cdimage/daily-builds/sid_d-i/arch-latest/amd64/iso-cd/debian-testing-amd64-netinst.iso' + my_description: 'Use d-i for presentations via d-i preseeding (with this preseed.cfg).' + my_timed: '42 15 23 * *' + my_recipients: 'holger@layer-acht.org' + - '{name}_debian_jessie_presentation': + my_title: 'Debian-Installer (jessie netboot) used for presentations' + my_shell: '/srv/jenkins/bin/g-i-installation.sh 1 http://d-i.debian.org/daily-images/amd64/daily/netboot/debian-installer/amd64/' + my_description: 'Use d-i for presentations via d-i preseeding (with this preseed.cfg).' + my_timed: '43 15 23 * *' + my_recipients: 'holger@layer-acht.org' + - '{name}_debian_wheezy_presentation': + my_title: 'Debian-Installer (wheezy netboot) used for presentations' + my_shell: '/srv/jenkins/bin/g-i-installation.sh 1 http://ftp.de.debian.org/debian/dists/wheezy/main/installer-amd64/current/images/netboot/debian-installer/amd64/' + my_description: 'Use d-i for presentations via d-i preseeding (with this preseed.cfg).' + my_timed: '44 15 23 * *' + my_recipients: 'holger@layer-acht.org' - '{name}_debian_sid_daily_rescue_spanish': my_title: 'Debian (sid daily build CD) rescue mode in Spanish' my_shell: '/srv/jenkins/bin/g-i-installation.sh 1 http://cdimage.debian.org/cdimage/daily-builds/sid_d-i/arch-latest/amd64/iso-cd/debian-testing-amd64-netinst.iso es es_ES' -- cgit v1.2.3-70-g09d2 From a11bf3d42b07c849d5bbfebab9144a6681767519 Mon Sep 17 00:00:00 2001 From: Holger Levsen Date: Mon, 24 Nov 2014 15:38:46 +0100 Subject: g-i: test gnome_(brltty|speakup) like gnome --- bin/g-i-installation.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/g-i-installation.sh b/bin/g-i-installation.sh index a33725fa..3cf880c7 100644 --- a/bin/g-i-installation.sh +++ b/bin/g-i-installation.sh @@ -637,7 +637,7 @@ post_install_boot() { *) ;; esac ;; - debian_*gnome) case $TOKEN in + debian_*gnome*) case $TOKEN in 0150) do_and_report move 530 420 click 1 ;; 0200) do_and_report key alt-f2 -- cgit v1.2.3-70-g09d2 From 5dd22aebc46771359cd1ec0bf5bd33bd447abe61 Mon Sep 17 00:00:00 2001 From: Holger Levsen Date: Tue, 25 Nov 2014 11:07:28 +0100 Subject: g-i: various fixes for presentation+speakup --- TODO | 1 + bin/g-i-installation.sh | 49 +++++++++++++++++++++++++++++-------------------- 2 files changed, 30 insertions(+), 20 deletions(-) diff --git a/TODO b/TODO index 601f273b..80060647 100644 --- a/TODO +++ b/TODO @@ -33,6 +33,7 @@ See link:https://jenkins.debian.net/userContent/about.html["about jenkins.debian * replace amd64 in scripts with $HOSTARCH * run debbindiff against .changes files in current directory, instead of $LONGPATHES (due to #764459) * reproducible_scheduler should never fail loudly +* g-i_presentation: use preseeding files on jenkins.d.n and not hands.com === jenkins-job-builder related diff --git a/bin/g-i-installation.sh b/bin/g-i-installation.sh index 3cf880c7..294c9ba1 100644 --- a/bin/g-i-installation.sh +++ b/bin/g-i-installation.sh @@ -322,7 +322,14 @@ bootstrap_system() { EXTRA_APPEND="$EXTRA_APPEND priority=critical" ;; esac - APPEND="auto=true $EXTRA_APPEND $INST_LOCALE $INST_KEYMAP url=$PRESEED_URL $INST_VIDEO -- quiet" + case $NAME in + *_presentation) + APPEND="auto=true $EXTRA_APPEND $INST_LOCALE $INST_KEYMAP $INST_VIDEO -- quiet" + ;; + *) + APPEND="auto=true $EXTRA_APPEND $INST_LOCALE $INST_KEYMAP url=$PRESEED_URL $INST_VIDEO -- quiet" + ;; + esac show_preseed $(hostname -f)/$PRESEED_PATH/${NAME}_$PRESEEDCFG echo echo "Starting QEMU now:" @@ -450,12 +457,12 @@ presentation_boot() { let MY_NR=NR-TRIGGER_NR TOKEN=$(printf "%04d" $MY_NR) case $TOKEN in - #0010) do_and_report key tab - # ;; - #0020) do_and_report key enter - # ;; - #0100) do_and_report key tab - # ;; + 0020) do_and_report key enter + ;; + 0300) do_and_report key enter + ;; + 0400) do_and_report key enter + ;; *) ;; esac } @@ -1135,13 +1142,13 @@ monitor_system() { # let's drive this further (once/if triggered) if [ $TRIGGER_NR -ne 0 ] && [ $TRIGGER_NR -ne $NR ] ; then case $MODE in - rescue) rescue_boot - ;; + rescue) rescue_boot + ;; presentation) presentation_boot - ;; + ;; post_install) post_install_boot - ;; - *) ;; + ;; + *) ;; esac fi # if TRIGGER_MODE matches NR, we are triggered too @@ -1192,7 +1199,7 @@ save_logs() { grep brltty $RESULTS/dpkg-l || echo "Warning: package brltty not installed." ;; *_speakup) - grep epeakup RESULTS/dpkg-l || echo "Warning: package espeakup not installed." + grep epeakup $RESULTS/dpkg-l || echo "Warning: package espeakup not installed." ;; *) ;; @@ -1293,16 +1300,16 @@ fi bootstrap_system set +x case $NAME in - *_rescue*) monitor_system rescue - ;; + *_rescue*) monitor_system rescue + ;; *_presentation) monitor_system presentation - ;; + ;; debian-edu_*combi-server) monitor_system install wait4match 3000 - ;; + ;; debian-edu_*wheezy*standalone*) monitor_system install wait4match 1200 - ;; - *) monitor_system install wait4match - ;; + ;; + *) monitor_system install wait4match + ;; esac # # boot up installed system @@ -1316,7 +1323,9 @@ case $NAME in *) # # kill qemu and image # + set -x sudo kill -9 $(ps fax | grep [q]emu-system | grep "vnc=$DISPLAY " 2>/dev/null | awk '{print $1}') || true + set +x if [ ! -z "$IMAGE" ] ; then sudo umount -l $IMAGE_MNT || true fi -- cgit v1.2.3-70-g09d2 From e663bde3a437a1059b33461fda0392634bbf5b61 Mon Sep 17 00:00:00 2001 From: Holger Levsen Date: Wed, 26 Nov 2014 00:13:08 +0100 Subject: g-i: force trigger mode for presentations --- bin/g-i-installation.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/g-i-installation.sh b/bin/g-i-installation.sh index 294c9ba1..64377935 100644 --- a/bin/g-i-installation.sh +++ b/bin/g-i-installation.sh @@ -457,7 +457,7 @@ presentation_boot() { let MY_NR=NR-TRIGGER_NR TOKEN=$(printf "%04d" $MY_NR) case $TOKEN in - 0020) do_and_report key enter + 0100) do_and_report key enter ;; 0300) do_and_report key enter ;; @@ -1302,7 +1302,7 @@ set +x case $NAME in *_rescue*) monitor_system rescue ;; - *_presentation) monitor_system presentation + *_presentation) monitor_system presentation 10 ;; debian-edu_*combi-server) monitor_system install wait4match 3000 ;; -- cgit v1.2.3-70-g09d2 From 94c77244b8064d6f29146f7f9e36389b5216076f Mon Sep 17 00:00:00 2001 From: Philip Hands Date: Tue, 25 Nov 2014 23:41:55 +0000 Subject: g-i: presentation -- let's see where 6 enters get us --- bin/g-i-installation.sh | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/bin/g-i-installation.sh b/bin/g-i-installation.sh index 64377935..375a4bf0 100644 --- a/bin/g-i-installation.sh +++ b/bin/g-i-installation.sh @@ -457,11 +457,7 @@ presentation_boot() { let MY_NR=NR-TRIGGER_NR TOKEN=$(printf "%04d" $MY_NR) case $TOKEN in - 0100) do_and_report key enter - ;; - 0300) do_and_report key enter - ;; - 0400) do_and_report key enter + 0[123456]00) do_and_report key enter ;; *) ;; esac -- cgit v1.2.3-70-g09d2