osd_login: add --disable-osdlogin for configure osd_login

PATCH In review Kinglong Mee 2 participants 5 messages Apr 15, 2015 – May 8, 2015

Subsystems (2)

NFS client NFS server

lore

Share & tools

lore

Kinglong Mee

author

2015-04-15 16:21 UTC #0 lore raw

PATCH 3/3 osd_login: add --disable-osdlogin for configure osd_login

Eino reports,
Configure using the following command

    ./configure --prefix=/home/username/installs/tmp --exec-prefix=/home/username/installs/tmp

When running "make install" most of the packages are put under /home/username/installs/tmp, but for some reason the install script tries to put osd_login under /sbin, which results in an error:

Making install in osd_login
make[2]: Entering directory /home/username/installs/nfs-utils-1.3.2/utils/osd_login' make[3]: Entering directory /home/username/installs/nfs-utils-1.3.2/utils/osd_login'
/usr/bin/mkdir -p '/sbin'
/usr/bin/install -c osd_login '/sbin'
/usr/bin/install: cannot remove ‘/sbin/osd_login’: Permission denied make[3]: *** [install-dist_sbinSCRIPTS] Error 1

Reported-by Eino Juhani Oltedal <[email protected]>

Signed-off-by Kinglong Mee <[email protected]>

---
 configure.ac      | 7 +++++++
 utils/Makefile.am | 5 ++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

configure.ac +7 -0

index d4301a2..33a2f57 100644
@@ -216,6 +216,13 @@ AC_ARG_ENABLE(nfsdcltrack,
 	enable_nfsdcltrack=$enableval,
 	enable_nfsdcltrack="yes")
 
+AC_ARG_ENABLE(osdlogin,
+	[AC_HELP_STRING([--disable-osdlogin],
+			[disable osd_login scripts @<:@default=no@:>@])],
+	enable_osdlogin=$enableval,
+	enable_osdlogin="yes")
+	AM_CONDITIONAL(CONFIG_OSD_LOGIN, [test "$enable_osdlogin" = "yes" ])
+
 dnl Check for TI-RPC library and headers
 AC_LIBTIRPC

utils/Makefile.am +4 -1

index b892dc8..6dd4a57 100644
@@ -25,6 +25,10 @@ if CONFIG_NFSDCLTRACK
 OPTDIRS += nfsdcltrack
 endif
 
+if CONFIG_OSD_LOGIN
+OPTDIRS += osd_login
+endif
+
 SUBDIRS = \
 	exportfs \
 	mountd \

@@ -32,7 +36,6 @@ SUBDIRS = \
 	nfsstat \
 	showmount \
 	statd \
-	osd_login \
 	$(OPTDIRS)
 
 MAINTAINERCLEANFILES = Makefile.in

Signature · 1 line

2.3.5

Steve Dickson

2015-05-07 14:17 UTC #1 lore raw

Quoted 15 lines · Kinglong Mee

Eino reports,
Configure using the following command
    ./configure --prefix=/home/username/installs/tmp --exec-prefix=/home/username/installs/tmp
When running "make install" most of the packages are put under /home/username/installs/tmp, but for some reason the install script tries to put osd_login under /sbin, which results in an error:
Making install in osd_login
make[2]: Entering directory /home/username/installs/nfs-utils-1.3.2/utils/osd_login' make[3]: Entering directory /home/username/installs/nfs-utils-1.3.2/utils/osd_login'
/usr/bin/mkdir -p '/sbin'
/usr/bin/install -c osd_login '/sbin'
/usr/bin/install: cannot remove ‘/sbin/osd_login’: Permission denied make[3]: *** [install-dist_sbinSCRIPTS] Error 1

Quoted 2 lines

Reported-by Eino Juhani Oltedal <[email protected]>
Signed-off-by Kinglong Mee <[email protected]>

I changed this just a bit... Instead of disabling it, I change it to enable the installation which is 'no' by default.

Committed...

steved.

Quoted 47 lines

---
 configure.ac      | 7 +++++++
 utils/Makefile.am | 5 ++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

configure.ac +7 -0

index d4301a2..33a2f57 100644
@@ -216,6 +216,13 @@ AC_ARG_ENABLE(nfsdcltrack,
 	enable_nfsdcltrack=$enableval,
 	enable_nfsdcltrack="yes")
 
+AC_ARG_ENABLE(osdlogin,
+	[AC_HELP_STRING([--disable-osdlogin],
+			[disable osd_login scripts @<:@default=no@:>@])],
+	enable_osdlogin=$enableval,
+	enable_osdlogin="yes")
+	AM_CONDITIONAL(CONFIG_OSD_LOGIN, [test "$enable_osdlogin" = "yes" ])
+
 dnl Check for TI-RPC library and headers
 AC_LIBTIRPC

utils/Makefile.am +4 -1

index b892dc8..6dd4a57 100644
@@ -25,6 +25,10 @@ if CONFIG_NFSDCLTRACK
 OPTDIRS += nfsdcltrack
 endif
 
+if CONFIG_OSD_LOGIN
+OPTDIRS += osd_login
+endif
+
 SUBDIRS = \
 	exportfs \
 	mountd \

@@ -32,7 +36,6 @@ SUBDIRS = \
 	nfsstat \
 	showmount \
 	statd \
-	osd_login \
 	$(OPTDIRS)
 
 MAINTAINERCLEANFILES = Makefile.in

Kinglong Mee

author

2015-05-07 15:00 UTC #2 lore raw

Quoted 70 lines · Steve Dickson

Quoted 15 lines · Kinglong Mee
Eino reports,
Configure using the following command
    ./configure --prefix=/home/username/installs/tmp --exec-prefix=/home/username/installs/tmp
When running "make install" most of the packages are put under /home/username/installs/tmp, but for some reason the install script tries to put osd_login under /sbin, which results in an error:
Making install in osd_login
make[2]: Entering directory /home/username/installs/nfs-utils-1.3.2/utils/osd_login' make[3]: Entering directory /home/username/installs/nfs-utils-1.3.2/utils/osd_login'
/usr/bin/mkdir -p '/sbin'
/usr/bin/install -c osd_login '/sbin'
/usr/bin/install: cannot remove ‘/sbin/osd_login’: Permission denied make[3]: *** [install-dist_sbinSCRIPTS] Error 1
Quoted 2 lines
Reported-by Eino Juhani Oltedal <[email protected]>
Signed-off-by Kinglong Mee <[email protected]>
I changed this just a bit... Instead of disabling it, I change it to enable the installation which is 'no' by default.
Committed...
steved.
Quoted 45 lines
---
 configure.ac      | 7 +++++++
 utils/Makefile.am | 5 ++++-
 2 files changed, 11 insertions(+), 1 deletion(-)
configure.ac +7 -0
index d4301a2..33a2f57 100644
@@ -216,6 +216,13 @@ AC_ARG_ENABLE(nfsdcltrack,
 	enable_nfsdcltrack=$enableval,
 	enable_nfsdcltrack="yes")
 
+AC_ARG_ENABLE(osdlogin,
+	[AC_HELP_STRING([--disable-osdlogin],
+			[disable osd_login scripts @<:@default=no@:>@])],
+	enable_osdlogin=$enableval,
+	enable_osdlogin="yes")
+	AM_CONDITIONAL(CONFIG_OSD_LOGIN, [test "$enable_osdlogin" = "yes" ])
+
 dnl Check for TI-RPC library and headers
 AC_LIBTIRPC
 
utils/Makefile.am +4 -1
index b892dc8..6dd4a57 100644
@@ -25,6 +25,10 @@ if CONFIG_NFSDCLTRACK
 OPTDIRS += nfsdcltrack
 endif
 
+if CONFIG_OSD_LOGIN
+OPTDIRS += osd_login
+endif
+
 SUBDIRS = \
 	exportfs \
 	mountd \
@@ -32,7 +36,6 @@ SUBDIRS = \
 	nfsstat \
 	showmount \
 	statd \
-	osd_login \
 	$(OPTDIRS)
 

Quoted 1 line

utils/Makefile.am SUBDIRS = \ · line 41
Quoted 1 line
utils/Makefile.am +0 -0
 MAINTAINERCLEANFILES = Makefile.in

Miss updating of utils/Makefile.am in your tree.

http://git.linux-nfs.org/?p=steved/nfs-utils.git;a=commitdiff;h=3e28fe73af023bf42e0d654146bfb9314b4d8438

thanks,
Kinglong Mee

Steve Dickson

2015-05-07 15:23 UTC #3 lore raw

Hello,

Quoted 3 lines · Kinglong Mee

Miss updating of utils/Makefile.am in your tree.
http://git.linux-nfs.org/?p=steved/nfs-utils.git;a=commitdiff;h=3e28fe73af023bf42e0d654146bfb9314b4d8438

Are you saying something is missing??

steved.

Kinglong Mee

author

2015-05-08 00:23 UTC #4 lore raw

Quoted 7 lines · Steve Dickson

Hello,
Quoted 3 lines · Kinglong Mee
Miss updating of utils/Makefile.am in your tree.
http://git.linux-nfs.org/?p=steved/nfs-utils.git;a=commitdiff;h=3e28fe73af023bf42e0d654146bfb9314b4d8438
Are you saying something is missing??

Yes,
the old patch also update utils/Makefile.am,
otherwise adding --enable-osdlogin is useless.

utils/Makefile.am +4 -1

index b892dc8..6dd4a57 100644
@@ -25,6 +25,10 @@ if CONFIG_NFSDCLTRACK
 OPTDIRS += nfsdcltrack
 endif
 
+if CONFIG_OSD_LOGIN
+OPTDIRS += osd_login
+endif
+
 SUBDIRS = \
 	exportfs \
 	mountd \

@@ -32,7 +36,6 @@ SUBDIRS = \
 	nfsstat \
 	showmount \
 	statd \
-	osd_login \
 	$(OPTDIRS)
 
 MAINTAINERCLEANFILES = Makefile.in

-- 2.3.5