Updated fds.in (changed its ip address, added lpaldi).

diff --git a/sources/fds.in/c3d/firstboot/data/USERS.txt b/sources/fds.in/c3d/firstboot/data/USERS.txt
index 78d111cb8151756a7e8ae23219bae976f4c35edb..23124f5e16b68ddb7f95ee61a2cb368e86644fe5 100644 (file)
--- a/sources/fds.in/c3d/firstboot/data/USERS.txt
+++ b/sources/fds.in/c3d/firstboot/data/USERS.txt
@@ -9,6 +9,7 @@
 10000, khorvath,       Kálmán,               Horváth,       kalman.horvath@userrendszerhaz.hu,      +36 20 444 8693
 10000, kkele,          Károly,                Kele,           karoly.kele@userrendszerhaz.hu,         +36 70 942 2450
 10000, kvajda,         Krisztina,      Vajda,          krisztina.vajda@userrendszerhaz.hu,     +36 20 313 0028
+10000, lpaldi,         Laura,          Páldi,         laura.paldi@userrendszerhaz.hu,         +36 20 980 6592
 10000, mszabo,         Marcell,        Szabó,         marcell.szabo@userrendszerhaz.hu,       +36 70 458 1234
 10000, pbognar,        Péter,         Bognár,                peter.bognar@userrendszerhaz.hu,        +36 20 350 6039
 10000, rrendek,        Róbert,                Rendek,         robert.rendek@userrendszerhaz.hu,       +36 30 977 5888

diff --git a/sources/fds.in/c3d/firstboot/scripts/01_setupnetworking.sh b/sources/fds.in/c3d/firstboot/scripts/01_setupnetworking.sh
index 9f704fbf7d1bbd51b6b5b9ff2762c3c8b004fc9d..f0a6f95e322968654bfc98d8737f0c761235e28d 100755 (executable)
--- a/sources/fds.in/c3d/firstboot/scripts/01_setupnetworking.sh
+++ b/sources/fds.in/c3d/firstboot/scripts/01_setupnetworking.sh
@@ -72,7 +72,7 @@ nmcli connection add \
     connection.id internal \
     connection.interface-name $CONNECTION_DEVICE \
     connection.type 802-3-ethernet \
-    ipv4.addresses "10.228.109.83/16" \
+    ipv4.addresses "10.228.109.147/16" \
     ipv4.dns "10.228.109.159, 10.228.92.159" \
     ipv4.dns-search "in.useribm.hu" \
     ipv4.gateway "10.228.109.254" \

diff --git a/sources/fds.in/c3d/firstboot/scripts/21_createusers.sh b/sources/fds.in/c3d/firstboot/scripts/21_createusers.sh
index 8fb9434627be7fce9fdf666cc0ab165e84c54a2d..facd4b28b9346605a88d86db495c23c26cca1f4f 100755 (executable)
--- a/sources/fds.in/c3d/firstboot/scripts/21_createusers.sh
+++ b/sources/fds.in/c3d/firstboot/scripts/21_createusers.sh
@@ -21,12 +21,12 @@ do
     UID_SHIFT=$(echo $COMPACT_LINE | cut -f 1 -d ',')
     LOGIN_NAME=$(echo $COMPACT_LINE | cut -f 2 -d ',')
     LOGIN_MD5SUM=$(echo $LOGIN_NAME | md5sum | awk '{print $1}')
-    UID_POSITION=30
+    UID_POSITION=1
     UID_IS_UNIQUE=0
     while [ $UID_IS_UNIQUE -eq 0 ]
     do
-        LOGIN_UID=$(echo $LOGIN_MD5SUM | cut -c ${UID_POSITION}- | cut -c 1-3)
-        INT_UID=$(python -c "print($UID_SHIFT + int('$LOGIN_UID', 16))")
+        LOGIN_UID=$(echo $LOGIN_MD5SUM | cut -c ${UID_POSITION}- | cut -c 1-4)
+        INT_UID=$(($UID_SHIFT + 16#$LOGIN_UID % 8192))
         grep $INT_UID $UIDS_FILE >/dev/null 2>&1
         if [ $? -eq 1 ]
         then
@@ -34,13 +34,13 @@ do
             echo $COMPACT_LINE | sed "s/^$UID_SHIFT/$INT_UID/" >>$FDS_INPUT_FILE
             UID_IS_UNIQUE=1
         else
-            UID_POSITION=$(( $UID_POSITION - 1 ))
-            echo "$LOGIN_NAME has been shifted to $UID_POSITION"
-            if [ $UID_POSITION -eq 0 ]
+            if [ $UID_POSITION -eq 29 ]
             then
                 echo "Cannot generate unique uid for $LOGIN_NAME" >&2
                 exit 1
             fi
+            UID_POSITION=$(( $UID_POSITION + 1 ))
+            echo "$LOGIN_NAME has been shifted to $UID_POSITION"
         fi
     done
 done

diff --git a/sources/fds.in/c3d/owner.txt b/sources/fds.in/c3d/owner.txt
index 1bb5c6eced49745b457fb1a30abf8ab6edc6ce03..49158bf7b8f118b29b240064cbe6a3c48f5f11e5 100644 (file)
--- a/sources/fds.in/c3d/owner.txt
+++ b/sources/fds.in/c3d/owner.txt
@@ -1,2 +1 @@
 # owner file (relative to /c3d)
-root:ssh_keys postinstall/install-data/etc/ssh/ssh_host_*_key

diff --git a/sources/fds.in/c3d/postinstall/scp/copy.list b/sources/fds.in/c3d/postinstall/scp/copy.list
index 3a9fc90558133cdf5a232561836bd2fd67fe5e5c..20d78ba9efa4185abad9d799d28c4b46f2d25c0c 100644 (file)
--- a/sources/fds.in/c3d/postinstall/scp/copy.list
+++ b/sources/fds.in/c3d/postinstall/scp/copy.list
@@ -1,2 +1,2 @@
 # source_host source_path
-fds.useribm.hu /tmp/fds.tar
+fds.in.useribm.hu /tmp/fds.tar

diff --git a/sources/fds.in/c3d/postinstall/ssh/run.list b/sources/fds.in/c3d/postinstall/ssh/run.list
index cb83df138e1a204c42fd0200bff087cb89df69ab..adb1dabc1700a3f94913665177f7c69c4babdd48 100644 (file)
--- a/sources/fds.in/c3d/postinstall/ssh/run.list
+++ b/sources/fds.in/c3d/postinstall/ssh/run.list
@@ -1,2 +1,2 @@
 # target_host target_user target_executable
-fds.useribm.hu root /usr/local/bin/backupfds.sh
+fds.in.useribm.hu root /usr/local/bin/backupfds.sh

diff --git a/sources/fds.in/config b/sources/fds.in/config
index c020290ffe00f9bc8ea5fb5b6cf42e0ce49b1bc0..7c5b7177099f275bc44bc426e046ccd64f845a09 100644 (file)
--- a/sources/fds.in/config
+++ b/sources/fds.in/config
@@ -1,14 +1,14 @@
 lxc.include = /usr/share/lxc/config/common.conf
 
 lxc.arch = x86_64
-lxc.uts.name = fds.useribm.hu
+lxc.uts.name = fds.in.useribm.hu
 lxc.rootfs.path = __CONTAINER_PATH__/rootfs
 lxc.mount.auto = proc:rw sys:ro
 
 lxc.net.0.type = veth
 lxc.net.0.flags = up
 lxc.net.0.link = brci-dev
-lxc.net.0.hwaddr = 02:0c:18:03:6d:53
+lxc.net.0.hwaddr = 02:0c:18:03:6d:93
 
 lxc.autodev = 1
 

diff --git a/sources/fds.in/envvars b/sources/fds.in/envvars
index 73b0b7ca8308be7bfe0f929269ffb5406dab0114..16fd9b413717e578c78e9595b20ea3fd3ff2deaf 100644 (file)
--- a/sources/fds.in/envvars
+++ b/sources/fds.in/envvars
@@ -8,7 +8,6 @@ SPEC_PACKAGES="389-ds-base \
                openssh-clients \
                openssh-server \
                postfix \
-               python-unversioned-command \
                rsync \
                sscg \
                sssd-client"