[debian-lan-devel] [debian-lan] 05/07: Improvements and cleanup d-i preseed setup.

Andreas B. Mundt andi at moszumanska.debian.org
Fri Sep 12 16:23:27 UTC 2014


This is an automated email from the git hooks/post-receive script.

andi pushed a commit to branch master
in repository debian-lan.

commit 6e62c95ba9b16ccc017c543ba52647056e146620
Author: Andreas B. Mundt <andi at debian.org>
Date:   Thu Sep 11 10:16:37 2014 +0200

    Improvements and cleanup d-i preseed setup.
---
 fai/config/package_config/FAISERVER        |   1 +
 fai/config/scripts/FAISERVER/40-dhcp       |   9 +-
 fai/config/scripts/FAISERVER/50-di-netboot | 393 ++++-------------------------
 3 files changed, 60 insertions(+), 343 deletions(-)

diff --git a/fai/config/package_config/FAISERVER b/fai/config/package_config/FAISERVER
index e666fdc..da65d2e 100644
--- a/fai/config/package_config/FAISERVER
+++ b/fai/config/package_config/FAISERVER
@@ -13,3 +13,4 @@ git
 
 ## PXE installer:
 di-netboot-assistant
+pxelinux
diff --git a/fai/config/scripts/FAISERVER/40-dhcp b/fai/config/scripts/FAISERVER/40-dhcp
index ae36d01..0198891 100755
--- a/fai/config/scripts/FAISERVER/40-dhcp
+++ b/fai/config/scripts/FAISERVER/40-dhcp
@@ -88,10 +88,15 @@ class "PXE-clients" {
    max-lease-time  120;
    server-name faiserver;
    next-server faiserver;
-   filename "fai/pxelinux.0";
-   #filename "debian-installer/pxelinux.0";
+   #filename "fai/pxelinux.0";
+   filename "debian-installer/pxelinux.0";
 }
 
+## Submit preseed file location to d-i:
+#if substring (option vendor-class-identifier, 0, 3) = "d-i" {
+#   filename "http://www/d-i/jessie/preseed.cfg";
+#}
+
 subnet ${SUBNET} netmask ${NETMASK} {
    pool {
       allow unknown-clients;
diff --git a/fai/config/scripts/FAISERVER/50-di-netboot b/fai/config/scripts/FAISERVER/50-di-netboot
index 0cef80b..02b52d4 100755
--- a/fai/config/scripts/FAISERVER/50-di-netboot
+++ b/fai/config/scripts/FAISERVER/50-di-netboot
@@ -7,6 +7,23 @@ DISTRI="$(sed s%/.*$%% ${target}/etc/debian_version)"
 
 if [ "$FAI_ACTION" == "install" ] || [ "$CONVERT" == "true" ] ; then
     cat >> "${target}/etc/di-netboot-assistant/pxelinux.HEAD" <<EOF
+LABEL Local Boot
+       MENU LABEL Boot from local hard disk
+       localboot 0
+EOF
+
+    if ifclass DISKLESS_SERVER ; then
+        cat >> "${target}/etc/di-netboot-assistant/pxelinux.HEAD" <<EOF
+
+LABEL Debian-LAN Live System
+       MENU LABEL Debian-LAN Live System
+       kernel ::/fai/vmlinuz
+       append initrd=::/fai/initrd.img ip=dhcp root=nfs4:/live aufs
+EOF
+    fi
+
+    cat >> "${target}/etc/di-netboot-assistant/pxelinux.HEAD" <<EOF
+
 LABEL Debian-LAN workstation (amd64)
        MENU LABEL Debian-LAN: Debian Installer + FAI (amd64)
        kernel ::/debian-installer/$DISTRI/amd64/linux
@@ -17,7 +34,8 @@ LABEL Debian-LAN workstation (i368)
        kernel ::/debian-installer/$DISTRI/i386/linux
        append initrd=::/debian-installer/$DISTRI/i386/initrd.gz auto=true priority=critical url=faiserver/d-i/$DISTRI/preseed.cfg
 
-TIMEOUT 50
+TIMEOUT 30
+
 EOF
     sed -i "s%^\(TFTP_ROOT=.*\)$%\#\1\nTFTP_ROOT=/srv/tftp%" ${target}/etc/di-netboot-assistant/di-netboot-assistant.conf
     sed -i "s%^#\($DISTRI\)%\1%"                             ${target}/etc/di-netboot-assistant/di-sources.list
@@ -25,385 +43,78 @@ EOF
     mkdir -p ${target}/var/www/html/d-i/$DISTRI
     cat > "${target}/var/www/html/d-i/$DISTRI/preseed.cfg" <<EOF
 #### Preconfiguration file
-### Localization
-# Preseeding only locale sets language, country and locale.
-$(debconf-get-selections | grep "^d-i")
+## For more examples and comments:
+##   https://www.debian.org/releases/stable/example-preseed.txt
 
-### 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
+### From the preseeding machine's debconf:
+$(debconf-get-selections | grep "^d-i")
 
-# netcfg will choose an interface that has link if possible. This makes it
-# skip displaying a list if there is more than one interface.
+### Network setup
 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.
-#d-i 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
-#d-i netcfg/dhcpv6_timeout string 60
-
-# If you prefer to configure the network manually, uncomment this line and
-# the static network configuration below.
-#d-i netcfg/disable_autoconfig 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.
-#
-# IPv4 example
-#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/get_nameservers string 192.168.1.1
-#d-i netcfg/confirm_static boolean true
-#
-# IPv6 example
-#d-i netcfg/get_ipaddress string fc00::2
-#d-i netcfg/get_netmask string ffff:ffff:ffff:ffff::
-#d-i netcfg/get_gateway string fc00::1
-#d-i netcfg/get_nameservers string fc00::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
-
-# If you want to force a hostname, regardless of what either the DHCP
-# server returns or what the reverse DNS entry for the IP is, uncomment
-# and adjust the following line.
-#d-i netcfg/hostname string somehost
-
-# 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 http.debian.net
 d-i mirror/http/directory string /debian
 d-i mirror/http/proxy string http://aptcache.intern: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 Debian User
-#d-i passwd/username string debian
-# 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
-
+d-i clock-setup/ntp-server string ntp.intern
 ### 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 regular
-
-# 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:
-# <raidtype> <devcount> <sparecount> <fstype> <mountpoint> \
-#          <devices> <sparedevices>
-
-#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-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, updates
-#d-i apt-setup/security_host string security.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
-
+d-i apt-setup/non-free boolean true
+d-i apt-setup/contrib boolean true
 ### Package selection
 #tasksel tasksel/first multiselect standard, web-server
-# If the desktop task is selected, install the kde and xfce desktops
-# instead of the default gnome desktop.
+tasksel tasksel/first multiselect
 #tasksel tasksel/desktop multiselect kde, xfce
-tasksel tasksel/desktop multiselect
-
 # Individual additional packages to install
-d-i pkgsel/include string fai-client nfs-common
-# 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
+d-i pkgsel/include string fai-client nfs-common aptitude
+### FIXME: GRUB default does not work: #712907 #759737
 
-### 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.
+### This command is run just before the install finishes, it does all the FAI magic:
 d-i preseed/late_command string mkdir -p /target/var/lib/fai/config; \\
-	in-target modprobe nfsv4; \\
-	in-target fai -vN -s nfs://faiserver/config softupdate; \\
-	in-target passwd -l root
+       in-target modprobe nfsv4; \\
+       in-target fai -vN -s nfs://faiserver/config softupdate; \\
+       in-target passwd -ld root
+
+#d-i finish-install/reboot_in_progress note
 EOF
-     $ROOTCMD chmod -R o+rX /var/www/html/d-i
+    $ROOTCMD chmod -R o+rX /var/www/html/d-i
 fi
 
 $ROOTCMD di-netboot-assistant install $DISTRI --arch=amd64
 $ROOTCMD di-netboot-assistant install $DISTRI --arch=i386
 $ROOTCMD di-netboot-assistant rebuild-menu
+
+# FIXME: Bug #759424
+$ROOTCMD cp /usr/lib/syslinux/modules/bios/ldlinux.c32 /srv/tftp/debian-installer/
+$ROOTCMD cp /usr/lib/syslinux/modules/bios/libcom32.c32 /srv/tftp/debian-installer/
+$ROOTCMD cp /usr/lib/syslinux/modules/bios/libutil.c32 /srv/tftp/debian-installer/
+
+
+
+#wheezy:
+#d-i preseed/late_command string mkdir -p /target/var/lib/fai/config; \
+#        mount -t proc proc /target/proc; \
+#        chroot /target service rpcbind start; \
+#        chroot /target service nfs-common start; \
+#        in-target fai -vN -s nfs://faiserver/config softupdate; \
+#        in-target passwd -l root

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/debian-lan.git



More information about the debian-lan-devel mailing list