Skip to contentSkip to conversation

xfsdump: don't fail installation if /sbin is symlink of /usr/sbin

PATCH In review Jan Tulak 2 participants 5 messages Nov 1, 2018 – Jan 9, 2019

lore
Share & tools
lore

Jan Tulak

author
#0 lore raw

PATCH 1/1 xfsdump: don't fail installation if /sbin is symlink of /usr/sbin

Some distributions, like Fedora, have /bin and /sbin as symlinks pointing to /usr/* and this patch adds compatibility for these cases.

---
 dump/Makefile    | 4 +++-
 restore/Makefile | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)
dump/Makefile +3 -1
index 97879fa..66f00d3 100644
@@ -100,7 +100,9 @@ install: default
 	$(INSTALL) -m 755 -d $(PKG_ROOT_SBIN_DIR)
 	$(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_ROOT_SBIN_DIR)
 	$(INSTALL) -m 755 -d $(PKG_SBIN_DIR)
-	$(INSTALL) -S $(PKG_ROOT_SBIN_DIR)/$(LTCOMMAND) $(PKG_SBIN_DIR)/$(LTCOMMAND)
+	# skip symlink when /sbin is alread symlinked to /usr/sbin, like on Fedora
+	test $(PKG_ROOT_SBIN_DIR) -ef $(PKG_SBIN_DIR) || \
+		$(INSTALL) -S $(PKG_ROOT_SBIN_DIR)/$(LTCOMMAND) $(PKG_SBIN_DIR)/$(LTCOMMAND)
 install-dev:
 
 .dep: $(COMMINCL) $(COMMON) $(INVINCL) $(INVCOMMON)
restore/Makefile +3 -1
index c6f3f25..20c870a 100644
@@ -110,7 +110,9 @@ install: default
 	$(INSTALL) -m 755 -d $(PKG_ROOT_SBIN_DIR)
 	$(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_ROOT_SBIN_DIR)
 	$(INSTALL) -m 755 -d $(PKG_SBIN_DIR)
-	$(INSTALL) -S $(PKG_ROOT_SBIN_DIR)/$(LTCOMMAND) $(PKG_SBIN_DIR)/$(LTCOMMAND)
+	# skip symlink when /sbin is alread symlinked to /usr/sbin, like on Fedora
+	test $(PKG_ROOT_SBIN_DIR) -ef $(PKG_SBIN_DIR) || \
+		$(INSTALL) -S $(PKG_ROOT_SBIN_DIR)/$(LTCOMMAND) $(PKG_SBIN_DIR)/$(LTCOMMAND)
 install-dev:
 
 .dep: $(COMMINCL) $(COMMON) $(INVINCL) $(INVCOMMON)
Signature · 1 line
2.19.1
Reviewed-by on v1 1/1
#1 lore raw
Quoted 2 lines · Jan Tulak

Some distributions, like Fedora, have /bin and /sbin as symlinks pointing to /usr/* and this patch adds compatibility for these cases.

xfsdump builds fine on Fedora, but only because somebody (me) was bad long long ago, in the spec file:

# Bit of a hack to move files from /sbin to /usr/sbin (cd $RPM_BUILD_ROOT/%{_sbindir}; rm xfsdump xfsrestore) (cd $RPM_BUILD_ROOT/%{_sbindir}; mv ../../sbin/xfsdump .) (cd $RPM_BUILD_ROOT/%{_sbindir}; mv ../../sbin/xfsrestore .)

I ... don't know why that was done. Seems like dump/restore /should/ just live in /sbin, no? I'm not sure what the symlink is/was for in the first place...

but I guess Debian does package it up that way:

# dpkg-query -L xfsdump | grep xfsrestore | xargs ls -l
-rwxr-xr-x 1 root root 246088 Aug  1  2014 /sbin/xfsrestore
lrwxrwxrwx 1 root root     16 Aug  1  2014 /usr/sbin/xfsrestore -> /sbin/xfsrestore

so, um, I guess this seems ok to handle the /sbin == /usr/sbin case.

Thanks,
-Eric

Quoted 37 lines
---
 dump/Makefile    | 4 +++-
 restore/Makefile | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)
dump/Makefile +3 -1
index 97879fa..66f00d3 100644
@@ -100,7 +100,9 @@ install: default
 	$(INSTALL) -m 755 -d $(PKG_ROOT_SBIN_DIR)
 	$(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_ROOT_SBIN_DIR)
 	$(INSTALL) -m 755 -d $(PKG_SBIN_DIR)
-	$(INSTALL) -S $(PKG_ROOT_SBIN_DIR)/$(LTCOMMAND) $(PKG_SBIN_DIR)/$(LTCOMMAND)
+	# skip symlink when /sbin is alread symlinked to /usr/sbin, like on Fedora
+	test $(PKG_ROOT_SBIN_DIR) -ef $(PKG_SBIN_DIR) || \
+		$(INSTALL) -S $(PKG_ROOT_SBIN_DIR)/$(LTCOMMAND) $(PKG_SBIN_DIR)/$(LTCOMMAND)
 install-dev:
 
 .dep: $(COMMINCL) $(COMMON) $(INVINCL) $(INVCOMMON)
restore/Makefile +3 -1
index c6f3f25..20c870a 100644
@@ -110,7 +110,9 @@ install: default
 	$(INSTALL) -m 755 -d $(PKG_ROOT_SBIN_DIR)
 	$(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_ROOT_SBIN_DIR)
 	$(INSTALL) -m 755 -d $(PKG_SBIN_DIR)
-	$(INSTALL) -S $(PKG_ROOT_SBIN_DIR)/$(LTCOMMAND) $(PKG_SBIN_DIR)/$(LTCOMMAND)
+	# skip symlink when /sbin is alread symlinked to /usr/sbin, like on Fedora
+	test $(PKG_ROOT_SBIN_DIR) -ef $(PKG_SBIN_DIR) || \
+		$(INSTALL) -S $(PKG_ROOT_SBIN_DIR)/$(LTCOMMAND) $(PKG_SBIN_DIR)/$(LTCOMMAND)
 install-dev:
 
 .dep: $(COMMINCL) $(COMMON) $(INVINCL) $(INVCOMMON)
#2 lore raw
Quoted 18 lines · Eric Sandeen
Quoted 2 lines · Jan Tulak

Some distributions, like Fedora, have /bin and /sbin as symlinks pointing to /usr/* and this patch adds compatibility for these cases.

xfsdump builds fine on Fedora, but only because somebody (me) was bad long long ago, in the spec file:

# Bit of a hack to move files from /sbin to /usr/sbin (cd $RPM_BUILD_ROOT/%{_sbindir}; rm xfsdump xfsrestore) (cd $RPM_BUILD_ROOT/%{_sbindir}; mv ../../sbin/xfsdump .) (cd $RPM_BUILD_ROOT/%{_sbindir}; mv ../../sbin/xfsrestore .)

I ... don't know why that was done. Seems like dump/restore /should/ just live in /sbin, no? I'm not sure what the symlink is/was for in the first place...

but I guess Debian does package it up that way:

Quoted 7 lines
# dpkg-query -L xfsdump | grep xfsrestore | xargs ls -l
-rwxr-xr-x 1 root root 246088 Aug  1  2014 /sbin/xfsrestore
lrwxrwxrwx 1 root root     16 Aug  1  2014 /usr/sbin/xfsrestore -> /sbin/xfsrestore

so, um, I guess this seems ok to handle the /sbin == /usr/sbin case.

Heh, ok, yes your fix is what I should have done 6 years ago :D

Thanks,
-Eric

author
#3 lore raw
Quoted 3 lines · Eric Sandeen
Quoted 1 line · Eric Sandeen

On 11/1/18 5:47 AM, Jan Tulak wrote:

snip

Quoted 9 lines
Quoted 4 lines

so, um, I guess this seems ok to handle the /sbin == /usr/sbin case.

Heh, ok, yes your fix is what I should have done 6 years ago :D

Thanks,
-Eric

This is not merged yet. Maybe it just got off your list somehow? :-)

Cheers
Jan

#4 lore raw
Quoted 10 lines · Jan Tulak
Quoted 3 lines · Eric Sandeen
Quoted 1 line · Eric Sandeen

On 11/1/18 5:47 AM, Jan Tulak wrote:

snip

Quoted 3 lines
Quoted 3 lines

so, um, I guess this seems ok to handle the /sbin == /usr/sbin case.

Quoted 8 lines
Quoted 6 lines
Quoted 1 line

Heh, ok, yes your fix is what I should have done 6 years ago :D

Thanks,
-Eric

This is not merged yet. Maybe it just got off your list somehow? :-)

Yep, it fell through the cracks, thanks for the reminder.

-Eric