X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;ds=sidebyside;f=febootstrap-to-supermin.sh;h=b6a2fd9daffc02ee05edaf797429116739a01e42;hb=refs%2Ftags%2F2.11;hp=5393ec797c2bfea1399bd5a2dc9c3c6b4f89af9f;hpb=82ce35c8f18003bb227a9dd3d2c4c912ce2148dc;p=febootstrap.git diff --git a/febootstrap-to-supermin.sh b/febootstrap-to-supermin.sh index 5393ec7..b6a2fd9 100755 --- a/febootstrap-to-supermin.sh +++ b/febootstrap-to-supermin.sh @@ -89,6 +89,7 @@ while read path <&7; do p_ld_so='^ld-[.0-9]+\.so$' p_libbfd='^libbfd-.*\.so$' p_libgcc='^libgcc_s-.*\.so\.([0-9]+)$' + p_libntfs3g='^libntfs-3g\.so\..*$' p_lib123so='^lib(.*)-[-.0-9]+\.so$' p_lib123so123='^lib(.*)-[-.0-9]+\.so\.([0-9]+)\.' p_libso123='^lib(.*)\.so\.([0-9]+)\.' @@ -97,11 +98,15 @@ while read path <&7; do if [ "$path" = "./fakeroot.log" ]; then : - # All we're going to keep are the special files /init, the daemon, + # All we're going to keep are the special files /init, # configuration files (/etc), devices and modifiable stuff (/var). elif [ "$path" = "./init" ]; then echo "$path" >&5 + # Get timezone configuration from local system. + elif [ "$path" = "./etc/localtime" ]; then + echo "$path" >&6 + elif [[ "$path" =~ $p_etc || "$path" =~ $p_dev || "$path" =~ $p_var ]] then echo "$path" >&5 @@ -134,6 +139,11 @@ while read path <&7; do elif [[ "$file" =~ $p_libgcc ]]; then echo "$dir/libgcc_s-*.so.${BASH_REMATCH[1]}" >&6 + # Special case for libntfs-3g.so.* + elif [[ "$file" =~ $p_libntfs3g ]]; then + [ -n "$libntfs3g_once" ] || echo "$dir/libntfs-3g.so.*" >&6 + libntfs3g_once=1 + # libfoo-1.2.3.so elif [[ "$file" =~ $p_lib123so ]]; then echo "$dir/lib${BASH_REMATCH[1]}-*.so" >&6