xfsdump: don't fail installation if /sbin is symlink of /usr/sbin
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
@@ -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
@@ -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
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
Signed-off-by Jan Tulak <[email protected]>--- dump/Makefile | 4 +++- restore/Makefile | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-)dump/Makefile +3
-1@@ -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@@ -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)
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/xfsrestoreso, um, I guess this seems ok to handle the /sbin ==
/usr/sbincase.Reviewed-by Eric Sandeen <[email protected]>
Heh, ok, yes your fix is what I should have done 6 years ago :D
Thanks,
-Eric
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/sbincase.Reviewed-by Eric Sandeen <[email protected]>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
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/sbincase.
Quoted 8 lines
Quoted 6 lines
Quoted 1 line
Reviewed-by Eric Sandeen <[email protected]>Heh, ok, yes your fix is what I should have done 6 years ago :D
Thanks,
-EricThis is not merged yet. Maybe it just got off your list somehow? :-)
Yep, it fell through the cracks, thanks for the reminder.
-Eric