summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorramon <ramongomez@us.es>2011-01-26 11:24:47 +0000
committerramon <ramongomez@us.es>2011-01-26 11:24:47 +0000
commitf56f8b299c6f71ba66f07381eb347fce7f6347d1 (patch)
treeb6fba08e4825a6d1384ce123bf16bd63bb472d85
parent562547a8da95caa33b0f4d20f4352651f57060e5 (diff)
Correción errata en detección de distribución de Ubuntu en script {{{upgrade-clients-udeb.sh}}}.
Incluir soporte para Reiser4 en cliente Initrd basado en Ubuntu Lucid. git-svn-id: https://opengnsys.es/svn/trunk@1398 a21b9725-9963-47de-94b9-378ad31fedc9
-rw-r--r--client/boot/udeblist-lucid.conf3
-rwxr-xr-xclient/boot/upgrade-clients-udeb.sh12
2 files changed, 9 insertions, 6 deletions
diff --git a/client/boot/udeblist-lucid.conf b/client/boot/udeblist-lucid.conf
index 8356575b..a88443b3 100644
--- a/client/boot/udeblist-lucid.conf
+++ b/client/boot/udeblist-lucid.conf
@@ -1,4 +1,5 @@
install:cryptsetup-udeb
+install:dmidecode-udeb
install:dmraid-udeb
install:dmsetup-udeb
install:e2fsprogs-udeb
@@ -10,12 +11,14 @@ install:kbd-udeb
install:lvm2-udeb
install:lsb-release-udeb
install:mdadm-udeb
+install:mkreiser4-udeb
install:mkreiserfs-udeb
install:ntfs-3g-udeb
install:ntfsprogs-udeb
install:openssh-client-udeb
install:openssh-server-udeb
install:parted-udeb
+install:reiser4progs-udeb
install:reiserfsprogs-udeb
install:util-linux-udeb
install:xfsprogs-udeb
diff --git a/client/boot/upgrade-clients-udeb.sh b/client/boot/upgrade-clients-udeb.sh
index f03819e2..080340af 100755
--- a/client/boot/upgrade-clients-udeb.sh
+++ b/client/boot/upgrade-clients-udeb.sh
@@ -9,15 +9,15 @@
# Variables
PROG="$(basename $0)"
OPENGNSYS=${OPENGNSYS:-"/opt/opengnsys"}
-test "$(lsb_release -is 2>/dev/null)" == "Ubuntu" && DEFDISTRIB="(lsb_release -cs)"
+test "$(lsb_release -is 2>/dev/null)" == "Ubuntu" && DEFDISTRIB="$(lsb_release -cs)"
DEFDISTRIB=${DEFDISTRIB:-"lucid"}
DISTRIB=${1:-"$DEFDISTRIB"} # Si no se indica, usar distribución por defecto.
-CFGFILE="$OPENGNSYS/etc/udeblist${1:+"-$1"}.conf"
+CFGFILE="$OPENGNSYS/etc/udeblist-$DISTRIB.conf"
OGUDEB="$OPENGNSYS/client/lib/udeb"
TMPUDEB="/tmp/udeb"
UDEBLIST="/etc/apt/sources.list.d/udeb.list"
-#/// Comprobar fichero de configuración.
+# Comprobar fichero de configuración.
if [ ! -f "$CFGFILE" ]; then
echo "$PROG: No existe el fichero de configuración \"$CFGFILE\"" >&2
exit 1
@@ -29,12 +29,12 @@ if [ -z "$PACKAGES_INSTALL" ]; then
exit 2
fi
-#/// Crear configuración para apt-get
-echo "deb http://archive.ubuntu.com/ubuntu/ $DISTRIB main/debian-installer" >$UDEBLIST
+# Crear configuración para apt-get
+echo "deb http://archive.ubuntu.com/ubuntu/ $DISTRIB main/debian-installer universe/debian-installer" >$UDEBLIST
mkdir -p $TMPUDEB/partial
rm -f $TMPUDEB/*.udeb
-#/// Descargar paquetes udeb, borrar los descartables y moverlos al NFS.
+# Descargar paquetes udeb, borrar los descartables y moverlos al NFS.
apt-get update
apt-get install -y -o dir::cache::archives=$TMPUDEB -d $PACKAGES_INSTALL
for i in $PACKAGES_REMOVE; do