Changeset 499

Timestamp:

06/26/09 20:30:09 (3 years ago)

Author:

tschmitt

Message:

• Paket: kexec-tools aus build dependencies entfernt.
• Linbofs:
  • mount/umount jetzt von Ubuntu 9.04, nicht mehr von Busybox.
  • ext4-Unterstützung implementiert.
  • Rsync auf Version 3.0.6 aktualisiert.
  • linbo_cmd: o lokales menu.lst Handling verbessert: Eigene menu.lst-Dateien werden von LINBO

nicht mehr verändert, Menue-Position des Windows-Systems wird nun
ermittelt und beim Reboot als Default gesetzt (betr. nur Windows-Systeme, die
den Reboot-Workaround benötigen, zuvor wurde immer der 2. Eintrag gestartet).

o Verbessertes Patching der fstab bei Linuxclients:

Dateisystem-Typ wird der Rootpartition wird ermittelt und ggf. gepatcht, wenn er
in fstab nicht korrekt eingetragen ist; fstab wird nur gepatcht, falls Rootpartition
oder Dateisystem-Typ abweichen, nicht mehr praeventiv.

Location:

main/linuxmuster-linbo/trunk

Files:

• conf/initramfs.conf (modified) (3 diffs)
• conf/kernel.conf (modified) (4 diffs)
• debian/changelog (modified) (2 diffs)
• debian/control (modified) (1 diff)
• debian/md5sums.src (modified) (1 diff)
• linbo/etc/udev/links.conf (modified) (1 diff)
• linbo/linbo_cmd.sh (modified) (7 diffs)

main/linuxmuster-linbo/trunk/conf/initramfs.conf

@@ -35 +35 @@
 file /lib/libnss_compat.so.2 /lib/libnss_compat.so.2 755 0 0
 file /lib/libnss_files.so.2 /lib/libnss_files.so.2 755 0 0
+file /lib/libselinux.so.1 /lib/libselinux.so.1 755 0 0
 file /lib/libuuid.so.1 /lib/libuuid.so.1 755 0 0
 file /lib/terminfo/l/linux /lib/terminfo/l/linux 755 0 0
@@ -88 +89 @@
 file /lib/libblkid.so.1 /lib/libblkid.so.1 755 0 0
 file /lib/libe2p.so.2 /lib/libe2p.so.2 755 0 0
+slink /sbin/mkfs.ext2 ../bin/mke2fs 755 0 0
+slink /sbin/mkfs.ext3 ../bin/mke2fs 755 0 0
+slink /sbin/mkfs.ext4 ../bin/mke2fs 755 0 0
+
+# mount
+file /bin/mount /bin/mount 755 0 0
+file /bin/umount /bin/umount 755 0 0
+file /lib/libvolume_id.so.1 /lib/libvolume_id.so.1 755 0 0
+file /lib/libsepol.so.1 /lib/libsepol.so.1 755 0 0
 
 # mkdosfs
@@ -160 +170 @@
 
 # udev
-file /lib/libselinux.so.1 /lib/libselinux.so.1 755 0 0
 file /sbin/insmod /sbin/insmod 755 0 0
 file /sbin/modprobe /sbin/modprobe 755 0 0

main/linuxmuster-linbo/trunk/conf/kernel.conf

@@ -2 +2 @@
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.30
-# Fri Jun 12 14:46:31 2009
+# Wed Jun 24 19:13:52 2009
 #
 # CONFIG_64BIT is not set
@@ -153 +153 @@
 CONFIG_STOP_MACHINE=y
 CONFIG_BLOCK=y
-# CONFIG_LBD is not set
+CONFIG_LBD=y
 # CONFIG_BLK_DEV_BSG is not set
-# CONFIG_BLK_DEV_INTEGRITY is not set
+CONFIG_BLK_DEV_INTEGRITY=y
 
 #
@@ -1738 +1738 @@
 CONFIG_FILE_LOCKING=y
 # CONFIG_XFS_FS is not set
+# CONFIG_GFS2_FS is not set
 # CONFIG_OCFS2_FS is not set
 # CONFIG_BTRFS_FS is not set
@@ -2074 +2075 @@
 CONFIG_CRC_CCITT=y
 CONFIG_CRC16=y
-# CONFIG_CRC_T10DIF is not set
+CONFIG_CRC_T10DIF=y
 # CONFIG_CRC_ITU_T is not set
 CONFIG_CRC32=y

main/linuxmuster-linbo/trunk/debian/changelog

@@ -1 +1 @@
 linuxmuster-linbo (1.1.21-1) unstable; urgency=low
 
+  * package: removed kexec-tools from build dependencies
   * linbofs:
-    - improved menu.lst handling in linbo_cmd, custom menu.lsts were not touched anymore,
-      computing menu.lst entry number for windows systems with reboot workaround to be able
-      to set the grub default accordingly.
+    - changed from busybox mount/unount to Ubuntu's mount/umount
+    - added ext4 support for linux clients.
+    - updated to rsync 3.0.6
+    - linbo_cmd:
+      o improved menu.lst handling in linbo_cmd, custom menu.lsts were not
+        touched anymore, computing menu.lst entry number for windows systems
+        with reboot workaround to be able to set the grub default accordingly.
+      o improved linux client fstab patching:
+        fstab will be patched only on synchronized start not on every start,
+        if fstype of root partition differs it will be corrected.
       
- -- Thomas Schmitt <schmitt@lmz-bw.de>  Tue, 23 Jun 2009 18:35:05 +0200
+ -- Thomas Schmitt <schmitt@lmz-bw.de>  Fri, 26 Jun 2009 20:00:14 +0200
 
 linuxmuster-linbo (1.1.20-1) unstable; urgency=low
@@ -33 +41 @@
       o removed insmod and modprobe
     - grub4dos: new upstream version 0.4.4-2009-06-11
-    - kexec now taken from Jaunty
+    - kexec, insmod and modprobe now taken from Ubuntu
 
  -- Thomas Schmitt <schmitt@lmz-bw.de>  Sat, 13 Jun 2009 18:05:05 +0200

main/linuxmuster-linbo/trunk/debian/control

@@ -4 +4 @@
 Maintainer: Thomas Schmitt <schmitt@lmz-bw.de>
 Build-Depends: debhelper (>=7.0.17ubuntu4), build-essential (>=11.4), fakeroot, wget, udev (>=141-1.1), udev-extras,
-               nasm, syslinux, ncurses-base, kexec-tools (>=20090000-2.0.0ubuntu3), coreutils, sysvinit-utils, util-linux,
+               nasm, syslinux, ncurses-base, coreutils, sysvinit-utils, util-linux,
                tetex-base, libstdc++6, reiserfsprogs, e2fsprogs, dosfstools, unzip, tar, gzip, gettext, zlib1g-dev,
                libncurses5-dev, tetex-bin, tetex-extra, udpcast, perl, libpopt-dev, libacl1-dev, libattr1-dev,

main/linuxmuster-linbo/trunk/debian/md5sums.src

@@ -4 +4 @@
 82476af067f5325ebb8be30e5350f839  grub4dos-0.4.4-2009-06-11-src.zip
 d9f2ecd3c3307905f24130a25816e6cc  kexec-tools-2.0.0.tar.bz2
-d5bb5a59bc26337cc8b93a430ff407a1  linux-2.6.30.tar.bz2
+7a80058a6382e5108cdb5554d1609615  linux-2.6.30.tar.bz2
 6fad0a69ac89440ad4f696dbbbf11497  ms-sys-2.1.3.tgz
 e0b5c170f088a8d82968f0a6b34d31da  ntfs-3g-2009.4.4.tgz
 2b39dece8897bc748f4ab4c40ec7699e  ntfsprogs-2.0.0.tar.bz2
 e649dc2587954e1a55c4acf6667a96fc  qt-embedded-free-3.3.7.tar.bz2
-46183b8ba930c846551e04736eec9515  rsync-3.0.6pre1.tar.gz
+e9865d093a18e4668b9d31b635dc8e99  rsync-3.0.6.tar.gz
 257ac04e62ab7e3616e220333a1140cb  ssmtp_2.62.orig.tar.gz
 c9f4e73e385c86b3a8faf9b615a04836  syslinux-3.82.tar.bz2

main/linuxmuster-linbo/trunk/linbo/etc/udev/links.conf

@@ -7 +7 @@
 M null c 1 3
 M ppp c 108 0
+M cloop0 b 240 0
+M cloop1 b 240 1
+M cloop2 b 240 2
+M cloop3 b 240 3
+M cloop4 b 240 4
+M cloop5 b 240 5
+M cloop6 b 240 6
+M cloop7 b 240 7
+L cloop cloop0
 L core /proc/kcore
 L fd /proc/self/fd

main/linuxmuster-linbo/trunk/linbo/linbo_cmd.sh

@@ -271 +271 @@
  # fix vanished cloop device
  if [ "$1" = "/dev/cloop" ]; then
-  [ -e "/dev/cloop" ] || ln -s /dev/cloop0 /dev/cloop
+  [ -e "/dev/cloop" ] || ln -sf /dev/cloop0 /dev/cloop
  fi
  for i in 1 2 3 4 5; do
@@ -315 +315 @@
   swap) mkswap "$1" ;;
   reiserfs) mkreiserfs -f -f  "$1" ;;
-  ext2) mke2fs -b 4096 -f 4096 -m 0 "$1" ;;
-  ext3) mke2fs -b 4096 -f 4096 -m 0 -j "$1" ;;
+  ext2|ext3|ext4) mkfs."$2" "$1" ;;
   [Nn][Tt][Ff][Ss]*) mkfs.ntfs -Q "$1" ;;
   *[Ff][Aa][Tt]*) mkdosfs -F 32 "$1" ;;
@@ -516 +515 @@
 }
 
-# tschmitt
-# patch fstab with root partition
-patch_fstab(){
- echo -n "patch_fstab " ;  printargs "$@"
- local appendstr="$1"
- local line=""
- local rootpart=""
- local found=""
- local item=""
- for item in $appendstr; do
-  echo $item | grep -q ^root && rootpart=`echo $item | awk -F\= '{ print $2 }'`
- done
- [ -z "$rootpart" ] && return 1
- [ -e /tmp/fstab ] && rm -f /tmp/fstab
- while read line; do
-  mntpnt=`echo $line | awk '{ print $2 }'`
-  if [ "$mntpnt" = "/" -a "$found" = "" ] && ! echo "$line" | grep ^#; then
-   echo "$line" | sed -e 's,.* /,'"$rootpart"' /,' - >> /tmp/fstab
-   found=yes
-  else
-    echo "$line" >> /tmp/fstab
-  fi
- done </mnt/etc/fstab
- if [ -n "$found" ]; then
-  echo "Setze Rootpartition in fstab -> $rootpart."
-  mv -f /mnt/etc/fstab /mnt/etc/fstab.bak
-  mv -f /tmp/fstab /mnt/etc
- fi
-}
-
-# compute grub menu.lst entry number: boot
+# compute grub menu.lst entry number: grubnr boot
 grubnr(){
  [ -s /cache/boot/grub/menu.lst ] || return 1
@@ -630 +599 @@
    # change bootloader for win98 systems
    APPEND="$(echo $APPEND | sed -e 's/ntldr/io.sys/')"
-  elif [ -e /mnt/etc/fstab ]; then
-   # tschmitt: patch fstab with root device
-   patch_fstab "$APPEND"
   fi
  else
@@ -1008 +974 @@
 }
 
+# tschmitt
+# patch fstab with root partition and root fstype: patch_fstab rootdev
+patch_fstab(){
+ echo -n "patch_fstab " ;  printargs "$@"
+ local rootdev="$1"
+ local line=""
+ local found=""
+ local fstype_mount=""
+ local fstype_fstab=""
+ local mntpnt=""
+ local changed=""
+ local rootdev_fstab=""
+ local options=""
+ local dump=""
+ local pass=""
+ [ -z "$rootdev" ] && return 1
+ [ -e "$rootdev" ] || return 1
+ [ -e /tmp/fstab ] && rm -f /tmp/fstab
+ while read line; do
+  if [ -n "$line" -a "${line:0:1}" != "#" ]; then
+   mntpnt="$(echo "$line" | awk '{ print $2 }')"
+   if [ "$mntpnt" = "/" -a -z "$found" ]; then
+    found=yes
+    rootdev_fstab="$(echo "$line" | awk '{ print $1 }')"
+    [ -z "$rootdev_fstab" ] && return 1
+    fstype_fstab="$(echo "$line" | awk '{ print $3 }')"
+    [ -z "$fstype_fstab" ] && return 1
+    options="$(echo "$line" | awk '{ print $4 }')"
+    [ -z "$options" ] && return 1
+    dump="$(echo "$line" | awk '{ print $5 }')"
+    [ -z "$dump" ] && return 1
+    pass="$(echo "$line" | awk '{ print $6 }')"
+    [ -z "$pass" ] && return 1
+    if [ "$rootdev_fstab" != "$rootdev" ]; then
+     # change root partition if necessary
+     echo "Setze Rootpartition: $rootdev."
+     rootdev_fstab="$rootdev"
+     line="$rootdev_fstab $mntpnt $fstype_fstab $options $dump $pass"
+     changed=yes
+    fi # rootdev
+    # check for changed filesytem type if partition was formatted
+    fstype_mount="$(cat /proc/mounts | grep "^$rootdev" | awk '{ print $3 }')"
+    [ -z "$fstype_mount" ] && return 1
+    if [ "$fstype_fstab" != "$fstype_mount" ]; then
+     # change filesystem
+     echo "Setze Dateisystem: $fstype_mount."
+     fstype_fstab="$fstype_mount"
+     line="$rootdev_fstab $mntpnt $fstype_fstab $options $dump $pass"
+     changed=yes
+    fi # fstype
+   fi # mntpnt
+  fi # line
+  echo "$line" >> /tmp/fstab
+ done </mnt/etc/fstab # reading fstab
+ if [ -n "$changed" ]; then
+  mv -f /mnt/etc/fstab /mnt/etc/fstab.bak
+  mv -f /tmp/fstab /mnt/etc
+ fi
+}
+
 # syncl cachedev baseimage image bootdev rootdev kernel initrd append [force]
 syncl(){
  local RC=1
  local patchfile=""
+ local rootdev="$5"
  echo -n "syncl " ; printargs "$@"
  mountcache "$1" || return "$?"
@@ -1064 +1091 @@
     rm -f "$TMP"
    fi
+   # patching for linux systems
+   # hostname
    if [ -f /mnt/etc/hostname ]; then
     if [ -n "$HOSTNAME" ]; then
@@ -1070 +1099 @@
     fi
    fi
+   # fstab
+   [ -f /mnt/etc/fstab ] && patch_fstab "$rootdev"
    sync; sync; sleep 1
    umount /mnt || umount -l /mnt