| Submitter | Andreas Oberritter |
|---|---|
| Date | Feb. 24, 2012, 4:37 p.m. |
| Message ID | <1330101456-11889-1-git-send-email-obi@opendreambox.org> |
| Download | mbox | patch |
| Permalink | /patch/21943/ |
| State | New |
| Headers | show |
Comments
On 02/24/2012 08:37 AM, Andreas Oberritter wrote: > * Added cifs to mountnfs.sh and umountnfs.sh. > This patch appears to need to be rebased. Thanks Sau! > Signed-off-by: Andreas Oberritter<obi@opendreambox.org> > --- > .../initscripts/initscripts-1.0/mountnfs.sh | 8 +++++++- > .../initscripts/initscripts-1.0/umountnfs.sh | 2 +- > meta/recipes-core/initscripts/initscripts_1.0.bb | 2 +- > 3 files changed, 9 insertions(+), 3 deletions(-) > > diff --git a/meta/recipes-core/initscripts/initscripts-1.0/mountnfs.sh b/meta/recipes-core/initscripts/initscripts-1.0/mountnfs.sh > index 859fc9e..82ec7f6 100755 > --- a/meta/recipes-core/initscripts/initscripts-1.0/mountnfs.sh > +++ b/meta/recipes-core/initscripts/initscripts-1.0/mountnfs.sh > @@ -23,6 +23,7 @@ portmap=no > mount_nfs=no > mount_smb=no > mount_ncp=no > +mount_cifs=no > while read device mountpt fstype options > do > case "$device" in > @@ -56,6 +57,10 @@ do > then > mount_ncp=yes > fi > + if test "$fstype" = cifs > + then > + mount_cifs=yes > + fi > done > > exec 0>&1 > @@ -70,12 +75,13 @@ then > fi > fi > > -if test "$mount_nfs" = yes || test "$mount_smb" = yes || test "$mount_ncp" = yes > +if test "$mount_nfs" = yes || test "$mount_smb" = yes || test "$mount_ncp" = yes || test "$mount_cifs" = yes > then > echo "Mounting remote filesystems..." > test "$mount_nfs" = yes&& mount -a -t nfs > test "$mount_smb" = yes&& mount -a -t smbfs > test "$mount_ncp" = yes&& mount -a -t ncpfs > + test "$mount_cifs" = yes&& mount -a -t cifs > fi > > )< /etc/fstab > diff --git a/meta/recipes-core/initscripts/initscripts-1.0/umountnfs.sh b/meta/recipes-core/initscripts/initscripts-1.0/umountnfs.sh > index 15d1f73..af07540 100755 > --- a/meta/recipes-core/initscripts/initscripts-1.0/umountnfs.sh > +++ b/meta/recipes-core/initscripts/initscripts-1.0/umountnfs.sh > @@ -23,7 +23,7 @@ test -f /etc/fstab&& ( > # > while read device mountpt fstype options > do > - if test "$fstype" = nfs || test "$fstype" = smbfs || test "$fstype" = ncpfs > + if test "$fstype" = nfs || test "$fstype" = smbfs || test "$fstype" = ncpfs || test "$fstype" = cifs > then > umount -f $mountpt > fi > diff --git a/meta/recipes-core/initscripts/initscripts_1.0.bb b/meta/recipes-core/initscripts/initscripts_1.0.bb > index 203c605..b56c55c 100644 > --- a/meta/recipes-core/initscripts/initscripts_1.0.bb > +++ b/meta/recipes-core/initscripts/initscripts_1.0.bb > @@ -3,7 +3,7 @@ DESCRIPTION = "Initscripts provide the basic system startup initialization scrip > SECTION = "base" > LICENSE = "GPLv2" > LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" > -PR = "r129" > +PR = "r130" > > INHIBIT_DEFAULT_DEPS = "1" >
Patch
diff --git a/meta/recipes-core/initscripts/initscripts-1.0/mountnfs.sh b/meta/recipes-core/initscripts/initscripts-1.0/mountnfs.sh index 859fc9e..82ec7f6 100755 --- a/meta/recipes-core/initscripts/initscripts-1.0/mountnfs.sh +++ b/meta/recipes-core/initscripts/initscripts-1.0/mountnfs.sh @@ -23,6 +23,7 @@ portmap=no mount_nfs=no mount_smb=no mount_ncp=no +mount_cifs=no while read device mountpt fstype options do case "$device" in @@ -56,6 +57,10 @@ do then mount_ncp=yes fi + if test "$fstype" = cifs + then + mount_cifs=yes + fi done exec 0>&1 @@ -70,12 +75,13 @@ then fi fi -if test "$mount_nfs" = yes || test "$mount_smb" = yes || test "$mount_ncp" = yes +if test "$mount_nfs" = yes || test "$mount_smb" = yes || test "$mount_ncp" = yes || test "$mount_cifs" = yes then echo "Mounting remote filesystems..." test "$mount_nfs" = yes && mount -a -t nfs test "$mount_smb" = yes && mount -a -t smbfs test "$mount_ncp" = yes && mount -a -t ncpfs + test "$mount_cifs" = yes && mount -a -t cifs fi ) < /etc/fstab diff --git a/meta/recipes-core/initscripts/initscripts-1.0/umountnfs.sh b/meta/recipes-core/initscripts/initscripts-1.0/umountnfs.sh index 15d1f73..af07540 100755 --- a/meta/recipes-core/initscripts/initscripts-1.0/umountnfs.sh +++ b/meta/recipes-core/initscripts/initscripts-1.0/umountnfs.sh @@ -23,7 +23,7 @@ test -f /etc/fstab && ( # while read device mountpt fstype options do - if test "$fstype" = nfs || test "$fstype" = smbfs || test "$fstype" = ncpfs + if test "$fstype" = nfs || test "$fstype" = smbfs || test "$fstype" = ncpfs || test "$fstype" = cifs then umount -f $mountpt fi diff --git a/meta/recipes-core/initscripts/initscripts_1.0.bb b/meta/recipes-core/initscripts/initscripts_1.0.bb index 203c605..b56c55c 100644 --- a/meta/recipes-core/initscripts/initscripts_1.0.bb +++ b/meta/recipes-core/initscripts/initscripts_1.0.bb @@ -3,7 +3,7 @@ DESCRIPTION = "Initscripts provide the basic system startup initialization scrip SECTION = "base" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" -PR = "r129" +PR = "r130" INHIBIT_DEFAULT_DEPS = "1"
* Added cifs to mountnfs.sh and umountnfs.sh. Signed-off-by: Andreas Oberritter <obi@opendreambox.org> --- .../initscripts/initscripts-1.0/mountnfs.sh | 8 +++++++- .../initscripts/initscripts-1.0/umountnfs.sh | 2 +- meta/recipes-core/initscripts/initscripts_1.0.bb | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-)