[debian-lan-devel] [debian-lan] 01/01: Switch to jessie repositories. Dracut by default in the chroots.
Andreas B. Mundt
andi at alioth.debian.org
Tue Nov 5 18:31:03 UTC 2013
This is an automated email from the git hooks/post-receive script.
andi pushed a commit to branch master
in repository debian-lan.
commit 129d2c1101b13e68e3999da8100637c17ca1bc24
Author: Andreas B. Mundt <andi at debian.org>
Date: Tue Nov 5 12:09:33 2013 +0100
Switch to jessie repositories. Dracut by default in the chroots.
Apart from changing the repository, only minor modifications are
needed to get started with jessie so far. Use dracut in the chroots
by default.
---
fai/config/files/etc/apt/sources.list/CLIENT_A | 6 +++---
fai/config/files/etc/apt/sources.list/GATEWAY_A | 6 +++---
fai/config/files/etc/apt/sources.list/SERVER_A | 6 +++---
fai/config/files/etc/fai/NFSROOT/FAISERVER | 4 ++--
fai/config/files/etc/fai/apt/sources.list/SERVER_A | 6 +++---
fai/config/files/etc/fai/nfsroot.conf/FAISERVER | 2 +-
fai/config/files/etc/fai/nfsroot.conf/SERVER_A | 2 +-
fai/config/files/etc/rc.local/FAISERVER | 10 +++++-----
fai/config/package_config/EDU | 1 +
fai/config/scripts/DISKLESS_CLIENT/10-misc | 2 +-
fai/config/scripts/LOG_SERVER/30-kerberize | 2 +-
11 files changed, 24 insertions(+), 23 deletions(-)
diff --git a/fai/config/files/etc/apt/sources.list/CLIENT_A b/fai/config/files/etc/apt/sources.list/CLIENT_A
index f64802e..5efd091 100644
--- a/fai/config/files/etc/apt/sources.list/CLIENT_A
+++ b/fai/config/files/etc/apt/sources.list/CLIENT_A
@@ -1,6 +1,6 @@
-deb http://http.debian.net/debian/ wheezy main
+deb http://http.debian.net/debian/ jessie main
deb http://security.debian.org/ stable/updates main
-deb http://http.debian.net/debian/ wheezy-updates main
+deb http://http.debian.net/debian/ jessie-updates main
## Backports repository:
-deb http://http.debian.net/debian/ wheezy-backports main
+deb http://http.debian.net/debian/ jessie-backports main
diff --git a/fai/config/files/etc/apt/sources.list/GATEWAY_A b/fai/config/files/etc/apt/sources.list/GATEWAY_A
index f64802e..5efd091 100644
--- a/fai/config/files/etc/apt/sources.list/GATEWAY_A
+++ b/fai/config/files/etc/apt/sources.list/GATEWAY_A
@@ -1,6 +1,6 @@
-deb http://http.debian.net/debian/ wheezy main
+deb http://http.debian.net/debian/ jessie main
deb http://security.debian.org/ stable/updates main
-deb http://http.debian.net/debian/ wheezy-updates main
+deb http://http.debian.net/debian/ jessie-updates main
## Backports repository:
-deb http://http.debian.net/debian/ wheezy-backports main
+deb http://http.debian.net/debian/ jessie-backports main
diff --git a/fai/config/files/etc/apt/sources.list/SERVER_A b/fai/config/files/etc/apt/sources.list/SERVER_A
index f64802e..5efd091 100644
--- a/fai/config/files/etc/apt/sources.list/SERVER_A
+++ b/fai/config/files/etc/apt/sources.list/SERVER_A
@@ -1,6 +1,6 @@
-deb http://http.debian.net/debian/ wheezy main
+deb http://http.debian.net/debian/ jessie main
deb http://security.debian.org/ stable/updates main
-deb http://http.debian.net/debian/ wheezy-updates main
+deb http://http.debian.net/debian/ jessie-updates main
## Backports repository:
-deb http://http.debian.net/debian/ wheezy-backports main
+deb http://http.debian.net/debian/ jessie-backports main
diff --git a/fai/config/files/etc/fai/NFSROOT/FAISERVER b/fai/config/files/etc/fai/NFSROOT/FAISERVER
index 5a66462..81eef00 100644
--- a/fai/config/files/etc/fai/NFSROOT/FAISERVER
+++ b/fai/config/files/etc/fai/NFSROOT/FAISERVER
@@ -20,13 +20,13 @@ whois
firmware-bnx2 firmware-bnx2x firmware-realtek
# dracut can replace live-boot
-#dracut-network live-boot- live-boot-initramfs-tools-
+dracut-network live-boot- live-boot-initramfs-tools-
# squeeze also needs initramfs-tools, even with dracut
#initramfs-tools
# choose if you like live-boot or dracut inside the nfsroot
-live-boot
+#live-boot
# you should not edit the lines below
# architecture dependend list of packages that are installed
diff --git a/fai/config/files/etc/fai/apt/sources.list/SERVER_A b/fai/config/files/etc/fai/apt/sources.list/SERVER_A
index f64802e..5efd091 100644
--- a/fai/config/files/etc/fai/apt/sources.list/SERVER_A
+++ b/fai/config/files/etc/fai/apt/sources.list/SERVER_A
@@ -1,6 +1,6 @@
-deb http://http.debian.net/debian/ wheezy main
+deb http://http.debian.net/debian/ jessie main
deb http://security.debian.org/ stable/updates main
-deb http://http.debian.net/debian/ wheezy-updates main
+deb http://http.debian.net/debian/ jessie-updates main
## Backports repository:
-deb http://http.debian.net/debian/ wheezy-backports main
+deb http://http.debian.net/debian/ jessie-backports main
diff --git a/fai/config/files/etc/fai/nfsroot.conf/FAISERVER b/fai/config/files/etc/fai/nfsroot.conf/FAISERVER
index d03d009..7bf7667 100644
--- a/fai/config/files/etc/fai/nfsroot.conf/FAISERVER
+++ b/fai/config/files/etc/fai/nfsroot.conf/FAISERVER
@@ -11,4 +11,4 @@ FAI_DEBOOTSTRAP_OPTS="--exclude=info"
FAI_CONFIGDIR=/srv/fai/config
NFSROOT_ETC_HOSTS="192.168.33.250 faiserver"
-FAI_DEBOOTSTRAP="wheezy http://faiserver:9999/debian"
+FAI_DEBOOTSTRAP="jessie http://faiserver:9999/debian"
diff --git a/fai/config/files/etc/fai/nfsroot.conf/SERVER_A b/fai/config/files/etc/fai/nfsroot.conf/SERVER_A
index d999683..46d5c03 100644
--- a/fai/config/files/etc/fai/nfsroot.conf/SERVER_A
+++ b/fai/config/files/etc/fai/nfsroot.conf/SERVER_A
@@ -10,4 +10,4 @@ FAI_DEBOOTSTRAP_OPTS="--exclude=info"
# Configuration space
FAI_CONFIGDIR=/srv/fai/config
-FAI_DEBOOTSTRAP="wheezy http://http.debian.net/debian"
+FAI_DEBOOTSTRAP="jessie http://http.debian.net/debian"
diff --git a/fai/config/files/etc/rc.local/FAISERVER b/fai/config/files/etc/rc.local/FAISERVER
index 51d7f4d..a8238b5 100755
--- a/fai/config/files/etc/rc.local/FAISERVER
+++ b/fai/config/files/etc/rc.local/FAISERVER
@@ -28,7 +28,7 @@ check_network () {
setup_nfsroot () {
echo "Creating the nfsroot for FAI."
trap "rc=$?; rm -rf $NFSROOT; exit $rc" ERR SIGHUP SIGINT SIGTERM
- fai-setup -e -v -l
+ fai-setup -e -v
trap - ERR SIGHUP SIGINT SIGTERM
## Create pxelinux boot configuration for workstationXX.
## The seq range is sed from the corresponding variable
@@ -55,7 +55,7 @@ setup_nfsroot () {
setup_diskless () {
export LC_ALL=C
trap "rc=$?; rm -rf $DLROOT; exit $rc" ERR SIGHUP SIGINT SIGTERM
- fai -vNu diskless dirinstall $DLROOT/filesystem.dir/
+ fai -vNu diskless dirinstall $DLROOT
trap - ERR SIGHUP SIGINT SIGTERM
TEMPLATE=$TFTPROOT/pxelinux.cfg/diskless.tmpl
@@ -70,7 +70,7 @@ default Debian-LAN/FAI Live System
label Debian-LAN/FAI Live System
kernel $KERNEL
-append initrd=$INITRD ip=dhcp root=/dev/nfs nfsroot=/opt boot=live
+append initrd=$INITRD ip=dhcp root=/dev/nfs nfsroot=$DLROOT aufs
EOF
else
echo "The template $TEMPLATE exists already!"
@@ -106,7 +106,7 @@ setup_PXEinstaller () {
label Debian-LAN/FAI Roaming Machine
kernel $KERNEL
-append initrd=$INITRD ip=dhcp root=/dev/nfs nfsroot=/srv/fai/nfsroot boot=live FAI_FLAGS=verbose,sshd,createvt FAI_CONFIG_SRC=nfs://faiserver/srv/fai/config FAI_ACTION=install
+append initrd=$INITRD ip=dhcp root=/dev/nfs nfsroot=/srv/fai/nfsroot aufs FAI_FLAGS=verbose,sshd,createvt FAI_CONFIG_SRC=nfs://faiserver/srv/fai/config FAI_ACTION=install
menu title Boot menu
menu background debian-installer/i386/boot-screens/splash.png
@@ -170,7 +170,7 @@ if [ ! -d $DLROOT ] ; then
================================================================================
To install the chroot for diskless clients execute:
export LC_ALL=C
- fai -vNu diskless dirinstall $DLROOT/filesystem.dir/
+ fai -vNu diskless dirinstall $DLROOT
This can be done right now or manually.
If unanswered, this script will exit after $TIMEOUT seconds.
diff --git a/fai/config/package_config/EDU b/fai/config/package_config/EDU
index ae87524..f742d6c 100644
--- a/fai/config/package_config/EDU
+++ b/fai/config/package_config/EDU
@@ -22,6 +22,7 @@ audacity
viking
gvrng
scratch
+plm
## High school (consider also the DEVTOOLS class):
octave3.2
diff --git a/fai/config/scripts/DISKLESS_CLIENT/10-misc b/fai/config/scripts/DISKLESS_CLIENT/10-misc
index de6934a..60b4cc7 100755
--- a/fai/config/scripts/DISKLESS_CLIENT/10-misc
+++ b/fai/config/scripts/DISKLESS_CLIENT/10-misc
@@ -29,4 +29,4 @@ ainsl -q /etc/pam.d/common-auth "auth optional pam_group.so"
## Choose the default desktop:
#$ROOTCMD update-alternatives --set x-session-manager /usr/bin/startlxde
-$ROOTCMD update-alternatives --set x-session-manager /usr/bin/startxfce4
+$ROOTCMD update-alternatives --set x-session-manager /usr/bin/xfce4-session
diff --git a/fai/config/scripts/LOG_SERVER/30-kerberize b/fai/config/scripts/LOG_SERVER/30-kerberize
index 51cbcdb..310ef07 100755
--- a/fai/config/scripts/LOG_SERVER/30-kerberize
+++ b/fai/config/scripts/LOG_SERVER/30-kerberize
@@ -6,7 +6,7 @@
control:
any::
actionsequence = ( editfiles )
- EditFileSize = ( 30000 )
+ EditFileSize = ( 40000 )
editfiles:
any::
--
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