diff options
| author | Jan Tulak <jtulak@redhat.com> | 2019-01-11 17:29:38 -0600 |
|---|---|---|
| committer | Eric Sandeen <sandeen@redhat.com> | 2019-01-11 17:29:38 -0600 |
| commit | db93af5e3efe35e7da6208f2817ad598a75f7166 (patch) | |
| tree | 784100fa1da00ffe9cb0fe5199edb0ded7448e8b | |
| parent | 8866703074d4c01831a254c42c645afef8075b23 (diff) | |
| download | xfsdump-dev-db93af5e3efe35e7da6208f2817ad598a75f7166.tar.gz | |
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.
Signed-off-by: Jan Tulak <jtulak@redhat.com>
Reviewed-by: Eric Sandeen <sandeen@redhat.com>
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>
| -rw-r--r-- | dump/Makefile | 4 | ||||
| -rw-r--r-- | restore/Makefile | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/dump/Makefile b/dump/Makefile index 97879fad..66f00d32 100644 --- a/dump/Makefile +++ b/dump/Makefile @@ -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) diff --git a/restore/Makefile b/restore/Makefile index c6f3f25d..20c870a0 100644 --- a/restore/Makefile +++ b/restore/Makefile @@ -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) |