- updated ntfs-3g to 2017.3.23.

- updated chntpw download address.
- opsi improvements concerning migration from babo to v7.
- fixed removement of double windows efi boot entries.

conf/initramfs.conf

@@ -1,6 +1,6 @@
 # initramfs.conf
 # thomas@linuxmuster.net
-# 20171009
+# 20180430
 
 # busybox
 dir /bin 755 0 0
@@ -116,7 +116,7 @@ file /sbin/fatlabel ../../src/bin32/sbin/fatlabel 755 0 0
 
 # ntfs-3g
 file /bin/ntfs-3g ../../src/ntfs-3g/src/.libs/ntfs-3g 755 0 0
-file /lib/libntfs-3g.so.87 ../../src/ntfs-3g/libntfs-3g/.libs/libntfs-3g.so.87 755 0 0
+file /lib/libntfs-3g.so.88 ../../src/ntfs-3g/libntfs-3g/.libs/libntfs-3g.so.88 755 0 0
 slink /etc/mtab /proc/mounts 755 0 0
 slink /sbin/mount.ntfs ../bin/ntfs-3g 755 0 0
 slink /sbin/mount.ntfs-3g ../bin/ntfs-3g 755 0 0

conf/initramfs64.conf

@@ -122,7 +122,7 @@ file /sbin/fatlabel /sbin/fatlabel 755 0 0
 
 # ntfs-3g
 file /bin/ntfs-3g ../../src64/ntfs-3g/src/.libs/ntfs-3g 755 0 0
-file /lib/libntfs-3g.so.87 ../../src64/ntfs-3g/libntfs-3g/.libs/libntfs-3g.so.87 755 0 0
+file /lib/libntfs-3g.so.88 ../../src64/ntfs-3g/libntfs-3g/.libs/libntfs-3g.so.88 755 0 0
 slink /etc/mtab /proc/mounts 755 0 0
 slink /sbin/mount.ntfs ../bin/ntfs-3g 755 0 0
 slink /sbin/mount.ntfs-3g ../bin/ntfs-3g 755 0 0

debian/changelog

@@ -1,3 +1,12 @@
+linuxmuster-linbo (2.3.37-0) babo62; urgency=low
+
+  * updated ntfs-3g to 2017.3.23.
+  * updated chntpw download address.
+  * opsi improvements concerning migration from babo to v7.
+  * fixed removement of double windows efi boot entries.
+
+ -- Thomas Schmitt <thomas@linuxmuster.net>  Thu, 03 May 2018 16:35:21 +0000
+
 linuxmuster-linbo (2.3.36-0) babo62; urgency=low
 
   * linbofs: udev rules fixes.

debian/md5sums.src

@@ -1,8 +1,8 @@
 7925683d7dd105aabe9b6b618d48cc73  busybox-1.23.2.tar.bz2
 d60bc657206b07ad84d926649d6417dc  chntpw-source-140201.zip
 46d186707c7767db664afe681f8eaad6  ms-sys-2.3.0.tar.gz
-ccbe8672d0f757bd0c975b50aa4c512e  ntfs-3g_ntfsprogs-2016.2.22.tgz
 2edbe4d6c2eff33ef91732602f3518eb  qt-everywhere-opensource-src-4.8.6.tar.gz
 2fe7d3ba3b5756915f8f14b633e4cd42  cloop-4.8.tar.gz
 6aa49f47a99207a5066d747a6100f220  lsaSecrets-master.zip
 40c081c8bf5f06a55e1d995f2db4aa8b  linux-4.9.50.tar.xz
+d97474ae1954f772c6d2fa386a6f462c  ntfs-3g_ntfsprogs-2017.3.23.tgz

debian/rules

@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 #
 # thomas@linuxmuster.net
-# 20170725
+# 20180430
 # GPL v3
 #
 
@@ -77,7 +77,7 @@ BB64_DIR=src64/$(shell echo $(BB_ARCHIVE) | sed -e 's/.tar.bz2//')
 # chntpw
 CHNTPW_ARCHIVE=$(shell grep chntpw- debian/md5sums.src | awk '{ print $$2 }')
 CHNTPW_DIR=src/$(shell echo $(CHNTPW_ARCHIVE) | sed -e 's/-source//' | sed -e 's/.zip//')
-CHNTPW_URL=http://pogostick.net/~pnh/ntpasswd
+CHNTPW_URL=http://pkg.linuxmuster.net/linbo-build-cache
 
 # chntpw64
 CHNTPW64_DIR=src64/$(shell echo $(CHNTPW_ARCHIVE) | sed -e 's/-source//' | sed -e 's/.zip//')
@@ -400,13 +400,13 @@ build-stamp: configure-stamp
 	# ntfs-3g
 	-@if [ ! -e $(NTFS3G_DIR)/src/ntfs-3g ]; then \
 		echo "Building ntfs-3g..." ; \
-		( cd $(NTFS3G_DIR) && PATH=$(TOOLCHAIN):$(PATH) ARCH=i386 CFLAGS=-m32 ./configure --host=i386-linux-gnu --enable-xattr-mappings --enable-posix-acls && make && strip src/.libs/ntfs-3g && strip ntfsprogs/.libs/mkntfs && strip ntfsprogs/.libs/ntfsclone && strip ntfsprogs/.libs/ntfslabel && strip ntfsprogs/.libs/ntfsresize && strip libntfs-3g/.libs/libntfs-3g.so.87 ); \
+		( cd $(NTFS3G_DIR) && PATH=$(TOOLCHAIN):$(PATH) ARCH=i386 CFLAGS=-m32 ./configure --host=i386-linux-gnu --enable-xattr-mappings --enable-posix-acls && make && strip src/.libs/ntfs-3g && strip ntfsprogs/.libs/mkntfs && strip ntfsprogs/.libs/ntfsclone && strip ntfsprogs/.libs/ntfslabel && strip ntfsprogs/.libs/ntfsresize && strip libntfs-3g/.libs/libntfs-3g.so.88 ); \
 	fi
 
 	# ntfs-3g64
 	-@if [ ! -e $(NTFS3G64_DIR)/src/ntfs-3g ]; then \
 		echo "Building 64bit ntfs-3g..." ; \
-		( cd $(NTFS3G64_DIR) && ./configure --enable-xattr-mappings --enable-posix-acls && make && strip src/.libs/ntfs-3g && strip ntfsprogs/.libs/mkntfs && strip ntfsprogs/.libs/ntfsclone && strip ntfsprogs/.libs/ntfslabel && strip ntfsprogs/.libs/ntfsresize && strip libntfs-3g/.libs/libntfs-3g.so.87 ); \
+		( cd $(NTFS3G64_DIR) && ./configure --enable-xattr-mappings --enable-posix-acls && make && strip src/.libs/ntfs-3g && strip ntfsprogs/.libs/mkntfs && strip ntfsprogs/.libs/ntfsclone && strip ntfsprogs/.libs/ntfslabel && strip ntfsprogs/.libs/ntfsresize && strip libntfs-3g/.libs/libntfs-3g.so.88 ); \
 	fi
 
 	# qt32

files/lmn6/usr/share/linuxmuster-linbo/rsync-pre-download.sh

@@ -2,7 +2,7 @@
 #
 # Pre-Download script for rsync/LINBO
 # thomas@linuxmuster.net
-# 08.03.2016
+# 20180502
 #
 
 # read in linuxmuster.net specific environment
@@ -95,6 +95,13 @@ case $EXT in
     echo "Opsi key for $RSYNC_HOST_NAME found, providing key file."
     echo "$key" > "$FILE"
     chmod 644 "$FILE"
+    # upload opsiip to client
+    linbo-ssh "$compname" "echo $opsiip > /tmp/opsiip"
+    # get opsi server cert and provide it to client
+    opsipem="opsiconfd.pem"
+    rsync -v "$opsiip:/etc/opsi/$opsipem" "$LINBODIR/$opsipem"
+    chmod 600 "$LINBODIR/$opsipem"
+    linbo-scp -v "$LINBODIR/$opsipem" "$compname:/tmp"
    fi
   fi
  ;;

files/lmn7/usr/share/linuxmuster/linbo/rsync-pre-download.sh

@@ -2,7 +2,7 @@
 #
 # Pre-Download script for rsync/LINBO
 # thomas@linuxmuster.net
-# 20180216
+# 20180502
 #
 
 # read in linuxmuster specific environment
@@ -93,6 +93,13 @@ case $EXT in
     echo "Opsi key for $RSYNC_HOST_NAME found, providing key file."
     echo "$key" > "$FILE"
     chmod 644 "$FILE"
+    # upload opsiip to client
+    linbo-ssh "$compname" "echo $opsiip > /tmp/opsiip"
+    # get opsi server cert and provide it to client
+    opsipem="opsiconfd.pem"
+    rsync -v "$opsiip:/etc/opsi/$opsipem" "$LINBODIR/$opsipem"
+    chmod 600 "$LINBODIR/$opsipem"
+    linbo-scp -v "$LINBODIR/$opsipem" "$compname:/tmp"
    fi
   fi
  ;;

linbofs/etc/linbo-version

@@ -1 +1 @@
-LINBO 2.3.36-0
+LINBO 2.3.37-0

linbofs/usr/bin/linbo_cmd

@@ -8,7 +8,7 @@
 # ssd/4k/8k support - jonny@bzt.de 06.11.2012 anpassung fuer 2.0.12
 #
 # thomas@linuxmuster.net
-# 20180310
+# 20180503
 # GPL v3
 #
 
@@ -1064,7 +1064,7 @@ repair_efi(){
  local FOUND
  local bootnr
  # first remove redundant entries, keep entries with lower number
- efibootmgr | grep ^Boot[0-9] | sort > "$efiout" || return 1
+ efibootmgr | grep ^Boot[0-9] | sort -r > "$efiout" || return 1
  # read in the unique boot entries and test for multiple occurances of the same item
  awk -F\* '{ print $2 }' "$efiout" | sort -u | while read item; do
   [ -z "$item" ] && continue
@@ -2102,18 +2102,22 @@ patch_fstab(){
 
 # process opsi stuff if client is installed: do_opsi baseimage image
 do_opsi(){
- # test for opsi's client config
- local conf
- conf="$(ls /mnt/[Pp][Rr][Oo][Gg][Rr][Aa][Mm]*/opsi.org/opsi-client-agent/opsiclientd/opsiclientd.conf 2> /dev/null)"
- [ -s "$conf" ] || return 0
- echo "Starte OPSI-Client-Konfiguration ..."
+ # search for opsi's client config on windows partition
+ local opsidir="$(ls -d /mnt/[Pp][Rr][Oo][Gg][Rr][Aa][Mm]*/opsi.org/opsi-client-agent/opsiclientd 2> /dev/null)"
+ [ -d "$opsidir" ] || return 0
+ local opsiconf="$opsidir/opsiclientd.conf"
+ [ -s "$opsiconf" ] || return 0
+ echo "Starte OPSI-Client-Konfiguration:"
  local ip="$(grep ^ip /tmp/dhcp.log | awk -F\' '{ print $2 }')"
  local domainname="$(grep ^domain /tmp/dhcp.log | awk -F\' '{ print $2 }' | tail -1)"
  local fqdn="$(hostname).$domainname"
+ local depotid="opsi.$domainname"
  local serverip="$(grep ^linbo_server /tmp/dhcp.log | tail -1 | awk -F\' '{ print $2 }')"
- local opsiip="${serverip/.1.1/.1.2}"
+ local opsiip
+ local opsiserverpem
+ local opsiclientpem="$opsidir/opsiclientd.pem"
  local image
- local key
+ local clientkey
  local RC="0"
  if [ -n "$2" ]; then
   image="$2"
@@ -2123,28 +2127,58 @@ do_opsi(){
  # request opsikey
  localmode || rsync "$serverip"::linbo/"$ip.opsikey" /tmp/opsikey
  if [ -s /tmp/opsikey ]; then
-  key="$(cat /tmp/opsikey)"
+  echo " * Host-Key heruntergeladen."
+  clientkey="$(cat /tmp/opsikey)"
   # save opsi host key for offline use
   remote_cache "$(cachedev)" || cp /tmp/opsikey /cache
  else
   # load opsi from cache
   [ -s /cache/opsikey ] && key="$(cat /cache/opsikey)"
  fi
- if [ -n "$key" ]; then
-  echo "Opsi-Host-Key heruntergeladen."
-  # patch opsi host key
-  sed -e "s|^host_id.*|host_id = $fqdn|" -e "s|^opsi_host_key.*|opsi_host_key = $key|" -i "$conf" || RC="1"
-  # patch changed opsi ip
-  if ! grep -q "$opsiip" "$conf"; then
-   sed -e "s|10.*.1.2|$opsiip|g" -i "$conf" || RC="1"
-  fi
+ if [ -n "$clientkey" ]; then
+  # patch opsi host key & id
+  echo " * Host-Key gepatcht."
+  sed -e "s|^host_id.*|host_id = $fqdn|" -e "s|^opsi_host_key.*|opsi_host_key = $clientkey|" -i "$opsiconf" || RC="1"
+  # patch depot id
+  echo " * Depot-ID $depotid gepatcht."
+  sed -i "s|^depot_id.*|depot_id = $depotid|" "$opsiconf" || RC="1"
+  # get opsi ip
+  if [ -s /tmp/opsiip ]; then
+    opsiip="$(cat /tmp/opsiip)"
+    echo " * IP $opsiip vom Server erhalten."
+    # save opsi ip for offline use
+    remote_cache "$(cachedev)" || cp /tmp/opsiip /cache
+  elif [ -s /cache/opsiip ]; then
+    # load opsi ip from cache
+    opsiip="$(cat /cache/opsiip)"
+    echo " * IP $opsiip aus dem Cache geholt."
+  fi
+  if [ -n "$opsiip" ]; then
+    echo " * IP $opsiip gepatcht."
+    sed -i "s|^url = https.*|url = https://$opsiip:4447/rpc|" "$opsiconf" || RC="1"
+  fi
+  # get opsi server cert
+  if [ -s "/tmp/opsiconfd.pem" ]; then
+    echo " * Zertifikat heruntergeladen."
+    opsiserverpem="/tmp/opsiconfd.pem"
+    remote_cache "$(cachedev)" || cp "$opsiserverpem" /cache
+  elif [ -s "/cache/opsiconfd.pem" ]; then
+    echo " * Zertifikat aus dem Cache geholt."
+    opsiserverpem="/cache/opsiconfd.pem"
+  fi
+  # provide opsi server cert
+  if [ -n "$opsiserverpem" ]; then
+    echo " * Zertifikat kopiert."
+    cp "$opsiserverpem" "$opsiclientpem" || RC="1"
+  fi
+  # evaluate return code
   if [ "$RC" = "0" ]; then
-   echo "Opsi-Clientkonfiguration aktualisiert."
+   echo " * Erfolgreich beendet."
   else
-   echo "Opsi-Clientkonfiguration konnte nicht aktualisiert werden."
+   echo " * Aktualisierung war nicht moeglich!"
   fi
  else
-  echo "Opsi-Host-Key ist nicht verfuegbar."
+  echo " * Host-Key nicht verfuegbar!"
  fi
  rm -f /tmp/opsikey
  # request opsi host ini update