refs #503 modifis setsmbpass to execute some commands like root

ogboot_debian_installer
Luis Gerardo Romero Garcia 2024-08-05 10:40:48 +00:00
parent b2696b3783
commit d8d883073a
2 changed files with 10 additions and 13 deletions

View File

@ -379,8 +379,6 @@ function install() {
TMPDIR=/tmp/${OGLIVEFILE%.iso}
mkdir -p $OGLIVEDIR $TMPDIR
trap "umount $TMPDIR; rm -fr $TMPDIR" 1 2 3 6 9 15
echo "OGLIVEFILE: $OGLIVEFILE"
echo "TMPDIR: $TMPDIR"
sudo mount -o loop,ro $OGLIVEFILE $TMPDIR >/dev/null 2>&1 || { echo "{\"status\": \"error\", \"error\": \"mount failed.\"}"; exit 1; }
cp -va $TMPDIR/ogclient/* $OGLIVEDIR >/dev/null 2>&1 || { echo "{\"status\": \"error\", \"error\": \"Cannot copy files to ogLive directory.\"}"; exit 1; }
sudo umount $TMPDIR >/dev/null 2>&1
@ -399,14 +397,13 @@ function install() {
find -L $OGLIVEDIR -type d -exec chmod 755 {} \; >/dev/null 2>&1 || { echo "{\"status\": \"error\", \"error\": \"chmod directories failed.\"}"; exit 1; }
find -L $OGLIVEDIR -type f -exec chmod 644 {} \; >/dev/null 2>&1 || { echo "{\"status\": \"error\", \"error\": \"chmod files failed.\"}"; exit 1; }
chown -R :opengnsys $OGLIVEDIR >/dev/null 2>&1 || { echo "{\"status\": \"error\", \"error\": \"chown failed.\"}"; exit 1; }
sudo chown -R :opengnsys $OGLIVEDIR >/dev/null 2>&1 || { echo "{\"status\": \"error\", \"error\": \"chown failed.\"}"; exit 1; }
OGSQFS=$OGLIVEDIR/ogclient.sqfs
if mount -o loop,ro $OGSQFS $TMPDIR >/dev/null 2>&1; then
RSYNCSERV=$(rsync --version 2>/dev/null | awk '/protocol/ {print $6}')
RSYNCCLNT=$(chroot $TMPDIR /usr/bin/rsync --version 2>/dev/null | awk '/protocol/ {print $6}')
if sudo mount -o loop,ro $OGSQFS $TMPDIR >/dev/null 2>&1; then
RSYNCSERV=$(sudo rsync --version 2>/dev/null | awk '/protocol/ {print $6}')
RSYNCCLNT=$(sudo chroot $TMPDIR /usr/bin/rsync --version 2>/dev/null | awk '/protocol/ {print $6}')
if [ -z "$RSYNCSERV" ] || [ "$RSYNCSERV" -gt "${RSYNCCLNT:-1}" ]; then
if [ -e "$OPENGNSYS/client/bin/rsync-$RSYNCSERV" ]; then
mv -f "$OPENGNSYS/client/bin/rsync-$RSYNCSERV" "$OPENGNSYS/client/bin/rsync" 2>/dev/null
@ -416,9 +413,9 @@ function install() {
mv -f "$OPENGNSYS/client/bin/rsync" "$OPENGNSYS/client/bin/rsync-$($OPENGNSYS/client/bin/rsync --version 2>/dev/null | awk '/protocol/ {print $6}')"
fi
fi
umount $TMPDIR >/dev/null 2>&1
rmdir $TMPDIR >/dev/null 2>&1 || rm -rf $TMPDIR >/dev/null 2>&1
echo "deleting tmpdir"
sudo umount $TMPDIR >/dev/null 2>&1
sudo rmdir $TMPDIR >/dev/null 2>&1 || sudo rm -rf $TMPDIR >/dev/null 2>&1
fi
# Crear JSON output

View File

@ -119,15 +119,14 @@ EOT
echo "Error: No se pudo comprimir el archivo CPIO."
exit 5
fi
echo "tee step"
echo $CLIENTINITRD
# Paso 4: Escribir el archivo comprimido en el destino
sudo tee "$CLIENTINITRD" < /tmp/initrd.cpio.gz > /dev/null
# sudo tee "$CLIENTINITRD" < /tmp/initrd.cpio.gz > /dev/null
sudo dd if=/tmp/initrd.cpio.gz of=/opt/opengnsys/tftpboot/ogLive-5.11.0-r20210413/oginitrd.img
if [ $? -ne 0 ]; then
echo "Error: No se pudo escribir el archivo comprimido en el destino."
exit 5
fi
sudo rm /tmp/initrd.cpio /tmp/initrd.cpio.gz
else
echo "$PROG: Aviso: no se ha modificado la clave del cliente \"$OGLIVE\"."
@ -149,6 +148,7 @@ if [[ $CHANGES != 0 ]]; then
sudo chmod 600 /etc/rsyncd.secrets
# Cambiar clave Samba.
echo -ne "$SAMBAPASS\n$SAMBAPASS\n" | sudo smbpasswd -a -s $SAMBAUSER
echo "setsmbpass finish"
else
echo "$PROG: Aviso: no se ha modificado la clave de ningún cliente."
fi