JehanneOS
/
newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* postinstall: Disable adding registry mounts to /etc/fstab for now.

This commit is contained in:
Corinna Vinschen 2008-04-08 07:58:12 +00:00
parent 0838c75248
commit bffffaf652
2 changed files with 43 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,7 @@
2008-04-08 Corinna Vinschen <corinna@vinschen.de>
* postinstall: Disable adding registry mounts to /etc/fstab for now.
2008-04-07 Christopher Faylor <me+cygwin@cgf.cx> 2008-04-07 Christopher Faylor <me+cygwin@cgf.cx>
Remove unneeded header files from source files throughout. Remove unneeded header files from source files throughout.

75
winsup/cygwin/postinstall
View File

@ -124,48 +124,51 @@ then
EOF EOF
usr_bin="" #
usr_lib="" # TODO: Enable the below code for the first official release.
key='\HKLM\SOFTWARE\Cygnus Solutions\Cygwin\mounts v2' #
for subkey in $(regtool -q list "$key") #usr_bin=""
do #usr_lib=""
if [[ "$subkey" =~ /.* ]] #key='\HKLM\SOFTWARE\Cygnus Solutions\Cygwin\mounts v2'
then #for subkey in $(regtool -q list "$key")
[ "$subkey" = "/usr/bin" ] && usr_bin="1" #do
[ "$subkey" = "/usr/lib" ] && usr_lib="1" # if [[ "$subkey" =~ /.* ]]
nat=$(regtool -q get "$key\\$subkey\native") # then
nat="${nat//\\//}" # [ "$subkey" = "/usr/bin" ] && usr_bin="1"
nat="${nat// /\\040}" # [ "$subkey" = "/usr/lib" ] && usr_lib="1"
psx="${subkey// /\\040}" # nat=$(regtool -q get "$key\\$subkey\native")
flags=$(regtool -q get "$key\\$subkey\flags") # nat="${nat//\\//}"
echo -n "${nat} ${psx} some_fs " # nat="${nat// /\\040}"
print_flags $flags # psx="${subkey// /\\040}"
echo " 0 0" # flags=$(regtool -q get "$key\\$subkey\flags")
fi >> /etc/fstab # echo -n "${nat} ${psx} some_fs "
done # print_flags $flags
[ -z "$usr_bin" ] && # echo " 0 0"
# fi >> /etc/fstab
#done
#[ -z "$usr_bin" ] &&
echo "${CYGROOT//\\//}/bin /usr/bin ${FS_TYPE} binary 0 0" >> /etc/fstab echo "${CYGROOT//\\//}/bin /usr/bin ${FS_TYPE} binary 0 0" >> /etc/fstab
[ -z "$usr_lib" ] && #[ -z "$usr_lib" ] &&
echo "${CYGROOT//\\//}/lib /usr/lib ${FS_TYPE} binary 0 0" >> /etc/fstab echo "${CYGROOT//\\//}/lib /usr/lib ${FS_TYPE} binary 0 0" >> /etc/fstab
cygd="" #cygd=""
prefix=$(regtool -q get "$key\cygdrive prefix") #prefix=$(regtool -q get "$key\cygdrive prefix")
# Don't take system and cygdrive flags into account when testing ## Don't take system and cygdrive flags into account when testing
if [ -n "$prefix" \ #if [ -n "$prefix" \
-a \( "$prefix" != "/cygdrive" \ -o "$(( $flags & ~0x28 ))" -ne 2 \) ] # -a \( "$prefix" != "/cygdrive" \ -o "$(( $flags & ~0x28 ))" -ne 2 \) ]
then #then
cygd="1" # cygd="1"
psx="${prefix// /\\040}" # psx="${prefix// /\\040}"
echo -n "none ${psx} cygdrive " # echo -n "none ${psx} cygdrive "
print_flags $flags # print_flags $flags
echo ",user 0 0" # echo ",user 0 0"
fi >> /etc/fstab #fi >> /etc/fstab
if [ -z "$cygd" ] #if [ -z "$cygd" ]
then #then
echo "# This is default anyway:" >> /etc/fstab echo "# This is default anyway:" >> /etc/fstab
echo "# none /cygdrive cygdrive binary,user 0 0" >> /etc/fstab echo "# none /cygdrive cygdrive binary,user 0 0" >> /etc/fstab
fi #fi
IFS="$_OLD_IFS" IFS="$_OLD_IFS"
fi fi