opengnsys
/
oglive-builder
2
1
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

#460 #456 oginit ro images - ogprotocol nfs 

git-svn-id: https://opengnsys.es/svn/branches/version1.0@2431 a21b9725-9963-47de-94b9-378ad31fedc9
remotes/github/master
Antonio Doblas Viso 2012-01-12 20:34:55 +00:00
parent 4de592ea07
commit b4e1bf572e
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
includes/etc/initramfs-tools/scripts/ogfunctions
View File

@ -248,7 +248,8 @@ ogUpdateInitrd ()
{ {
cd /tmp cd /tmp
mkdir /tmp/cache mkdir /tmp/cache
mount -t reiserfs LABEL=CACHE /tmp/cache || return TYPE=$(blkid | grep CACHE | awk -F"TYPE=" '{print $2}' | tr -d \")
mount -t $TYPE LABEL=CACHE /tmp/cache || return
mkdir /tmp/cache/boot mkdir /tmp/cache/boot
@ -314,7 +315,7 @@ ogConnect ()
case "$PROTOCOL" in case "$PROTOCOL" in
nfs) nfs)
nfsmount -o nolock${READONLY} ${SERVER}:${SRC} ${DST} nfsmount ${SERVER}:${SRC} ${DST} -o nolock${READONLY} 2> /dev/null || mount.nfs ${SERVER}:${SRC} ${DST} -o nolock${READONLY}
;; ;;
smb) smb)
mount.cifs //${SERVER}/${SRC} ${DST} ${OPTIONS}${READONLY} mount.cifs //${SERVER}/${SRC} ${DST} ${OPTIONS}${READONLY}
@ -342,7 +343,7 @@ ogConnectOgLive ()
mount -t $TYPE LABEL=$LABEL $DSTOGLIVE mount -t $TYPE LABEL=$LABEL $DSTOGLIVE
if [ $? != 0 ] if [ $? != 0 ]
then then
mount -t reiserfs LABEL=CACHE $DSTOGLIVE mount LABEL=CACHE $DSTOGLIVE
export LOCALMEDIA=CACHE export LOCALMEDIA=CACHE
fi fi
else else

2
includes/etc/initramfs-tools/scripts/oginit
View File

@ -102,7 +102,7 @@ mountroot ()
[ "$ogdebug" == "true" ] && ogYesNo --timeout 5 --default no "Stop before connect with REPOSITORY STORAGE on $OGSERVERIMAGES : y/N " [ "$ogdebug" == "true" ] && ogYesNo --timeout 5 --default no "Stop before connect with REPOSITORY STORAGE on $OGSERVERIMAGES : y/N "
[ $? == 0 ] && sh || echo " " [ $? == 0 ] && sh || echo " "
ogConnect $OGSERVERIMAGES $OGPROTOCOL $SRCOGIMAGES $DSTOGIMAGES ogConnect $OGSERVERIMAGES $OGPROTOCOL $SRCOGIMAGES $DSTOGIMAGES ,ro
[ "$ogdebug" == "true" ] && ogYesNo --timeout 5 --default no "Stop before doing the postconfiguration: y/N " [ "$ogdebug" == "true" ] && ogYesNo --timeout 5 --default no "Stop before doing the postconfiguration: y/N "