[debian-lan-devel] [debian-lan] 06/08: Temporary fixes and workarounds.
Andreas B. Mundt
andi at moszumanska.debian.org
Wed Aug 10 12:49:46 UTC 2016
This is an automated email from the git hooks/post-receive script.
andi pushed a commit to branch master
in repository debian-lan.
commit ea80ee17f8ac97505003bcd7cd99248e865bf803
Author: Andreas B. Mundt <andi at debian.org>
Date: Tue Aug 9 09:30:58 2016 +0200
Temporary fixes and workarounds.
The redirections from 'httpredir.debian.org' fail too often and cause
anoying failures during tests. Switch to 'deb.debian.org' for the
time being.
---
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/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/usr/local/sbin/debian-lan-chroots/FAISERVER | 2 +-
fai/config/hooks/install.DEFAULT.sh | 2 +-
fai/config/hooks/savelog.LAST.sh | 4 +++-
fai/config/package_config/DESKTOP | 4 ++--
fai/config/package_config/DISKLESS_CLIENT | 4 ++--
fai/config/scripts/FAISERVER/50-di-netboot | 2 +-
fai/config/scripts/LOG_CLIENT/10-misc | 4 ++--
13 files changed, 26 insertions(+), 24 deletions(-)
diff --git a/fai/config/files/etc/apt/sources.list/CLIENT_A b/fai/config/files/etc/apt/sources.list/CLIENT_A
index b99928f..389f499 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://httpredir.debian.org/debian/ stretch main
+deb http://deb.debian.org/debian/ stretch main
deb http://security.debian.org/ stretch/updates main
-deb http://httpredir.debian.org/debian/ stretch-updates main
+deb http://deb.debian.org/debian/ stretch-updates main
## Backports repository:
-#deb http://httpredir.debian.org/debian/ stretch-backports main
+#deb http://deb.debian.org/debian/ stretch-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 b99928f..389f499 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://httpredir.debian.org/debian/ stretch main
+deb http://deb.debian.org/debian/ stretch main
deb http://security.debian.org/ stretch/updates main
-deb http://httpredir.debian.org/debian/ stretch-updates main
+deb http://deb.debian.org/debian/ stretch-updates main
## Backports repository:
-#deb http://httpredir.debian.org/debian/ stretch-backports main
+#deb http://deb.debian.org/debian/ stretch-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 b99928f..389f499 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://httpredir.debian.org/debian/ stretch main
+deb http://deb.debian.org/debian/ stretch main
deb http://security.debian.org/ stretch/updates main
-deb http://httpredir.debian.org/debian/ stretch-updates main
+deb http://deb.debian.org/debian/ stretch-updates main
## Backports repository:
-#deb http://httpredir.debian.org/debian/ stretch-backports main
+#deb http://deb.debian.org/debian/ stretch-backports main
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 1b98947..80ed2bf 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://httpredir.debian.org/debian/ stretch main
+deb http://deb.debian.org/debian/ stretch main
deb http://security.debian.org/ stable/updates main
-deb http://httpredir.debian.org/debian/ stretch-updates main
+deb http://deb.debian.org/debian/ stretch-updates main
## Backports repository:
-deb http://httpredir.debian.org/debian/ stretch-backports main
+#deb http://deb.debian.org/debian/ stretch-backports main
diff --git a/fai/config/files/etc/fai/nfsroot.conf/FAISERVER b/fai/config/files/etc/fai/nfsroot.conf/FAISERVER
index 0daf8e6..86f7b69 100644
--- a/fai/config/files/etc/fai/nfsroot.conf/FAISERVER
+++ b/fai/config/files/etc/fai/nfsroot.conf/FAISERVER
@@ -1,6 +1,6 @@
# For a detailed description see nfsroot.conf(5)
-FAI_DEBOOTSTRAP="stretch http://httpredir.debian.org/debian"
+FAI_DEBOOTSTRAP="stretch http://deb.debian.org/debian"
FAI_ROOTPW='$1$kBnWcO.E$djxB128U7dMkrltJHPf6d1'
NFSROOT=/srv/fai/nfsroot
diff --git a/fai/config/files/etc/fai/nfsroot.conf/SERVER_A b/fai/config/files/etc/fai/nfsroot.conf/SERVER_A
index 0daf8e6..86f7b69 100644
--- a/fai/config/files/etc/fai/nfsroot.conf/SERVER_A
+++ b/fai/config/files/etc/fai/nfsroot.conf/SERVER_A
@@ -1,6 +1,6 @@
# For a detailed description see nfsroot.conf(5)
-FAI_DEBOOTSTRAP="stretch http://httpredir.debian.org/debian"
+FAI_DEBOOTSTRAP="stretch http://deb.debian.org/debian"
FAI_ROOTPW='$1$kBnWcO.E$djxB128U7dMkrltJHPf6d1'
NFSROOT=/srv/fai/nfsroot
diff --git a/fai/config/files/usr/local/sbin/debian-lan-chroots/FAISERVER b/fai/config/files/usr/local/sbin/debian-lan-chroots/FAISERVER
index b292601..352661b 100755
--- a/fai/config/files/usr/local/sbin/debian-lan-chroots/FAISERVER
+++ b/fai/config/files/usr/local/sbin/debian-lan-chroots/FAISERVER
@@ -7,7 +7,7 @@ umask 0022
export http_proxy="http://aptcache:3128"
############################
-URL="httpredir.debian.org"
+URL="deb.debian.org"
INSTALLER="/usr/lib/debian-installer/images/*/*/text/debian-installer/"
DLROOT="/opt/live"
diff --git a/fai/config/hooks/install.DEFAULT.sh b/fai/config/hooks/install.DEFAULT.sh
index 8097e9c..1e1bc70 100755
--- a/fai/config/hooks/install.DEFAULT.sh
+++ b/fai/config/hooks/install.DEFAULT.sh
@@ -3,7 +3,7 @@
# Check if network is available.
#
-URL="http://httpredir.debian.org/"
+URL="http://deb.debian.org/"
while ! wget --quiet --output-document=/tmp/network-check $URL ; do
echo "Error accessing '$URL', check network and internet access."
if ! { dialog --stdout --backtitle " No network/internet access! " \
diff --git a/fai/config/hooks/savelog.LAST.sh b/fai/config/hooks/savelog.LAST.sh
index 5d81dcb..de9a63a 100755
--- a/fai/config/hooks/savelog.LAST.sh
+++ b/fai/config/hooks/savelog.LAST.sh
@@ -167,7 +167,9 @@ ldap_sasl_bind(SIMPLE): Can't contact LDAP server (-1)
Resolving www.intern (www.intern)... failed: Name or service not known
Enabling conf localized-error-pages
plugins-bad
-libpng warning: iCCP: known incorrect sRGB profile"
+libpng warning: iCCP: known incorrect sRGB profile
+WARNING: Failed to connect to lvmetad. Falling back to device scanning.
+update-rc.d: warning: start and stop actions are no longer supported; falling back to defaults"
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# The main routine
errorpatterns="$globalerrorpatterns
diff --git a/fai/config/package_config/DESKTOP b/fai/config/package_config/DESKTOP
index 6736324..8c912d6 100644
--- a/fai/config/package_config/DESKTOP
+++ b/fai/config/package_config/DESKTOP
@@ -1,7 +1,7 @@
PACKAGES install
## gnome desktop:
-task-gnome-desktop
+# FIXME: gdm fails # task-gnome-desktop
#gnome
## kde desktop:
@@ -9,7 +9,7 @@ task-gnome-desktop
#kde-full
## lxde-desktop:
-#task-lxde-desktop
+task-lxde-desktop
#lxde
## xfce desktop:
diff --git a/fai/config/package_config/DISKLESS_CLIENT b/fai/config/package_config/DISKLESS_CLIENT
index 6e3c6ce..e9cf9b1 100644
--- a/fai/config/package_config/DISKLESS_CLIENT
+++ b/fai/config/package_config/DISKLESS_CLIENT
@@ -3,7 +3,7 @@ nbd-client
libpam-script
## gnome desktop:
-task-gnome-desktop
+## FIXME ## task-gnome-desktop
#gnome
## kde desktop:
@@ -11,7 +11,7 @@ task-gnome-desktop
#kde-full
## lxde-desktop:
-#task-lxde-desktop
+task-lxde-desktop
#lxde
## xfce desktop:
diff --git a/fai/config/scripts/FAISERVER/50-di-netboot b/fai/config/scripts/FAISERVER/50-di-netboot
index 15fe9c4..ca205e0 100755
--- a/fai/config/scripts/FAISERVER/50-di-netboot
+++ b/fai/config/scripts/FAISERVER/50-di-netboot
@@ -56,7 +56,7 @@ d-i netcfg/get_domain string unassigned-domain
d-i netcfg/wireless_wep string
### Mirror settings
d-i mirror/country string manual
-d-i mirror/http/hostname string httpredir.debian.org
+d-i mirror/http/hostname string deb.debian.org
d-i mirror/http/directory string /debian
d-i mirror/http/proxy string http://aptcache.intern:3128/
### Account setup
diff --git a/fai/config/scripts/LOG_CLIENT/10-misc b/fai/config/scripts/LOG_CLIENT/10-misc
index 65c5379..f2ffe52 100755
--- a/fai/config/scripts/LOG_CLIENT/10-misc
+++ b/fai/config/scripts/LOG_CLIENT/10-misc
@@ -19,8 +19,8 @@ if [ -n $IP ] ; then
fi
## reconfigure munin-node on first boot (excludes diskless machines: 'dirinstall'):
-if [ "$FAI_ACTION" == "install" ] ; then
- FILE="$target/etc/rc.local"
+FILE="$target/etc/rc.local"
+if [ "$FAI_ACTION" == "install" ] && [ -e $FILE ] ; then
sed -i "s%\(^exit 0\)%\#\1%" $FILE
cat >> $FILE <<EOF
--
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