Changeset 513

Timestamp:

07/30/09 08:35:04 (3 years ago)

Author:

tschmitt

Message:

• Paket: registry-tools wieder aus Build-Depends entfernt.
• Kernel: Aktuelle Version 2.6.30.
• Linbofs:
  • kleiner Fix in patch_regeistry.
  • Busybox: Deaktualisiert zu Version 1.13.4 (mit 1.14.2 war die Algebra-Unterstützung in linbo_cmd fehlerhaft).
  • linbo_cmd: Dateisystemermittlung in restore() repariert (automatische Formatierung funktionierte nicht).

Location:

main/linuxmuster-linbo/branches/testing

Files:

• conf/busybox.conf (modified) (20 diffs)
• conf/kernel.conf (modified) (1 diff)
• debian/changelog (modified) (1 diff)
• debian/md5sums.src (modified) (1 diff)
• linbo/linbo_cmd.sh (modified) (3 diffs)
• linbo/patch_registry.sh (modified) (1 diff)

main/linuxmuster-linbo/branches/testing/conf/busybox.conf

@@ -1 +1 @@
 #
 # Automatically generated make config: don't edit
-# Busybox version: 1.14.2
-# Thu Jul 23 17:01:03 2009
+# Busybox version: 1.13.4
+# Wed Jul 29 20:27:27 2009
 #
 CONFIG_HAVE_DOT_CONFIG=y
@@ -48 +48 @@
 CONFIG_LFS=y
 CONFIG_CROSS_COMPILER_PREFIX=""
-CONFIG_EXTRA_CFLAGS=""
 
 #
@@ -112 +111 @@
 CONFIG_CPIO=y
 # CONFIG_FEATURE_CPIO_O is not set
-# CONFIG_FEATURE_CPIO_P is not set
 # CONFIG_DPKG is not set
 # CONFIG_DPKG_DEB is not set
@@ -210 +208 @@
 CONFIG_SEQ=y
 CONFIG_SHA1SUM=y
-# CONFIG_SHA256SUM is not set
-# CONFIG_SHA512SUM is not set
 CONFIG_SLEEP=y
 CONFIG_FEATURE_FANCY_SLEEP=y
@@ -391 +387 @@
 # CONFIG_USE_BB_SHADOW is not set
 CONFIG_USE_BB_CRYPT=y
-# CONFIG_USE_BB_CRYPT_SHA is not set
 CONFIG_ADDGROUP=y
 CONFIG_FEATURE_ADDUSER_TO_GROUP=y
@@ -428 +423 @@
 # Linux Module Utilities
 #
+CONFIG_DEFAULT_MODULES_DIR="/lib/modules"
+CONFIG_DEFAULT_DEPMOD_FILE="modules.dep"
 # CONFIG_MODPROBE_SMALL is not set
 # CONFIG_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE is not set
@@ -451 +448 @@
 CONFIG_FEATURE_MODUTILS_ALIAS=y
 CONFIG_FEATURE_MODUTILS_SYMBOLS=y
-CONFIG_DEFAULT_MODULES_DIR="/lib/modules"
-CONFIG_DEFAULT_DEPMOD_FILE="modules.dep"
 
 #
 # Linux System Utilities
 #
-# CONFIG_ACPID is not set
-# CONFIG_FEATURE_ACPID_COMPAT is not set
 # CONFIG_BLKID is not set
 CONFIG_DMESG=y
@@ -480 +473 @@
 # CONFIG_MKFS_MINIX is not set
 # CONFIG_FEATURE_MINIX2 is not set
-# CONFIG_MKFS_VFAT is not set
 CONFIG_GETOPT=y
 CONFIG_HEXDUMP=y
@@ -559 +551 @@
 # CONFIG_FEATURE_CROND_D is not set
 # CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set
-CONFIG_FEATURE_CROND_DIR=""
 # CONFIG_CRONTAB is not set
 CONFIG_DC=y
@@ -572 +563 @@
 # CONFIG_FEATURE_EJECT_SCSI is not set
 # CONFIG_FBSPLASH is not set
-# CONFIG_FLASH_ERASEALL is not set
-# CONFIG_IONICE is not set
 # CONFIG_INOTIFYD is not set
 CONFIG_LAST=y
@@ -582 +571 @@
 CONFIG_FEATURE_LESS_BRACKETS=y
 CONFIG_FEATURE_LESS_FLAGS=y
+# CONFIG_FEATURE_LESS_DASHCMD is not set
 CONFIG_FEATURE_LESS_MARKS=y
 CONFIG_FEATURE_LESS_REGEXP=y
+# CONFIG_FEATURE_LESS_LINENUMS is not set
 # CONFIG_FEATURE_LESS_WINCH is not set
-# CONFIG_FEATURE_LESS_DASHCMD is not set
-# CONFIG_FEATURE_LESS_LINENUMS is not set
 CONFIG_HDPARM=y
 CONFIG_FEATURE_HDPARM_GET_IDENTITY=y
@@ -610 +599 @@
 CONFIG_FEATURE_TASKSET_FANCY=y
 CONFIG_TIME=y
-# CONFIG_TIMEOUT is not set
 CONFIG_TTYSIZE=y
 CONFIG_WATCHDOG=y
@@ -628 +616 @@
 CONFIG_ETHER_WAKE=y
 CONFIG_FAKEIDENTD=y
-# CONFIG_FTPD is not set
-# CONFIG_FEATURE_FTP_WRITE is not set
 CONFIG_FTPGET=y
 CONFIG_FTPPUT=y
@@ -637 +623 @@
 # CONFIG_FEATURE_HTTPD_RANGES is not set
 # CONFIG_FEATURE_HTTPD_USE_SENDFILE is not set
+# CONFIG_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP is not set
 # CONFIG_FEATURE_HTTPD_SETUID is not set
 # CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set
 # CONFIG_FEATURE_HTTPD_AUTH_MD5 is not set
+# CONFIG_FEATURE_HTTPD_CONFIG_WITH_MIME_TYPES is not set
 # CONFIG_FEATURE_HTTPD_CGI is not set
 # CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR is not set
@@ -727 +715 @@
 CONFIG_UDHCPC_DEFAULT_SCRIPT="/usr/share/udhcpc/default.script"
 CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80
-CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="-R -n"
 CONFIG_VCONFIG=y
 CONFIG_WGET=y
@@ -735 +722 @@
 CONFIG_ZCIP=y
 # CONFIG_TCPSVD is not set
-# CONFIG_TUNCTL is not set
-# CONFIG_FEATURE_TUNCTL_UG is not set
 # CONFIG_UDPSVD is not set
 
@@ -756 +741 @@
 # CONFIG_FEATURE_REFORMIME_COMPAT is not set
 # CONFIG_SENDMAIL is not set
+# CONFIG_FEATURE_SENDMAIL_MAILX is not set
+# CONFIG_FEATURE_SENDMAIL_MAILXX is not set
 
 #
@@ -834 +821 @@
 CONFIG_ASH_READ_TIMEOUT=y
 CONFIG_ASH_ALIAS=y
+CONFIG_ASH_MATH_SUPPORT=y
+CONFIG_ASH_MATH_SUPPORT_64=y
 CONFIG_ASH_GETOPTS=y
 CONFIG_ASH_BUILTIN_ECHO=y
@@ -851 +840 @@
 # CONFIG_HUSH_LOOPS is not set
 # CONFIG_HUSH_CASE is not set
-# CONFIG_HUSH_FUNCTIONS is not set
-# CONFIG_HUSH_EXPORT_N is not set
 # CONFIG_LASH is not set
 # CONFIG_MSH is not set
@@ -859 +846 @@
 # Bourne Shell Options
 #
-CONFIG_SH_MATH_SUPPORT=y
-# CONFIG_SH_MATH_SUPPORT_64 is not set
 CONFIG_FEATURE_SH_EXTRA_QUIET=y
 CONFIG_FEATURE_SH_STANDALONE=y

main/linuxmuster-linbo/branches/testing/conf/kernel.conf

@@ -1 +1 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.30.2
-# Wed Jul 22 08:40:30 2009
+# Linux kernel version: 2.6.30.3
+# Wed Jul 29 20:54:13 2009
 #
 # CONFIG_64BIT is not set

main/linuxmuster-linbo/branches/testing/debian/changelog

@@ +1 @@
+linuxmuster-linbo (1.99.3-0) unstable; urgency=low
+
+  * package:
+    - removed registry-tools from build-deps
+  * kernel:
+    - new version 2.6.30.3
+  * linbofs:
+    - patch_registry: minor fix
+    - back to busybox 1.13.4 (bb 1.14.2 breaks bash math support in 1.99.2)
+    - linbo_cmd: fixed broken fstype in restore()
+
+ -- Thomas Schmitt <schmitt@lmz-bw.de>  Thu, 30 Jul 2009 07:56:56 +0200
+
 linuxmuster-linbo (1.99.2-0) unstable; urgency=low
 

main/linuxmuster-linbo/branches/testing/debian/md5sums.src

@@ -1 @@
-c13b09b4125688d5fca5c95a79bf814a  busybox-1.14.2.tar.bz2
+8a5eb7f15d4077d18fa97bda7a4e5412  busybox-1.13.4.tar.bz2
 09addfe7ae469677da39ed66d83858d3  chntpw-source-080526.zip
 0b203f03eb15828bf9e017b310c5c0f1  cloop_2.629-1.tar.gz
 82476af067f5325ebb8be30e5350f839  grub4dos-0.4.4-2009-06-11-src.zip
 d9f2ecd3c3307905f24130a25816e6cc  kexec-tools-2.0.0.tar.bz2
-890a03483dc9843100c6b51deebfc3bd  linux-2.6.30.2.tar.bz2
+5499e1fd246215d65fc7068cfb040406  linux-2.6.30.3.tar.bz2
 6fad0a69ac89440ad4f696dbbbf11497  ms-sys-2.1.3.tgz
 e16a67f191de810ea9af48b05b704ed8  ntfs-3g-2009.4.4AC.15.tgz

main/linuxmuster-linbo/branches/testing/linbo/linbo_cmd.sh

@@ -969 +969 @@
  local disk="${2%%[1-9]*}"
  local force="$3"
+ local fstype="$(fstype_startconf "$2")"
  echo -n "Entpacke: $1 -> $2 "
  case "$1" in
@@ -975 +976 @@
     check_status "$2" "$1" || force="force"
    fi
-   if [ "$(fstype "$2")" = "ntfs" -a "$force" = "force" ]; then
+   if [ "$fstype" = "ntfs" -a "$force" = "force" ]; then
     echo "[Komplette Partition]..."
     cp_cloop "$1" "$2" ; RC="$?"
     # set flag for complete cloop restore
     touch /tmp/.cloop
-   elif [ "$type" = "vfat" -a "$force" = "force" ]; then
+   elif [ "$fstype" = "vfat" -a "$force" = "force" ]; then
     echo "[Komplette Partition]..."
     cp_cloop "$1" "$2" ; RC="$?"
@@ -986 +987 @@
     echo "[Datei-Sync]..."
     if [ "$force" = "force" ]; then
-      format "$2" "$type" || return 1
+      format "$2" "$fstype" || return 1
     fi
     sync_cloop "$1" "$2" ; RC="$?"

main/linuxmuster-linbo/branches/testing/linbo/patch_registry.sh

@@ -126 +126 @@
  ####
  [ -n "$DEBUG" ] && echo " 7 change=$change" | tee -a $logfile
-
- if [ "$change" = "" ]; then 
-  return 1
- fi
+ [ "${change// /}" = "" ] && return 1
 
  command="cd ${fullpath}\n"