From ad50c8272e2213150fbe958a8e425473b2cf70c0 Mon Sep 17 00:00:00 2001
From: Jesse Smith <jsmith@resonatingmedia.com>
Date: Thu, 12 Sep 2019 17:35:55 -0300
Subject: [PATCH] Make sure git ignores new executable files in src directory.
 Make location of libcrypt library more flexible.

---
 doc/Changelog  | 7 +++++++
 src/.gitignore | 2 ++
 src/Makefile   | 6 ++++--
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/doc/Changelog b/doc/Changelog
index 249e355..aa244d7 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,10 @@
+sysvinit (2.97) unreleased; urgency=low
+
+    * Check $(ROOT) filesystem for libcrypt instead of a hardcoded path to /usr.
+      Added logsave and readbootlog to list of files git ignores.
+      - Patches provided by Petr Ovtchenkov.
+
+
 sysvinit (2.96) released; urgency=low
 
   [ Jesse Smith ]
diff --git a/src/.gitignore b/src/.gitignore
index dca9e1c..a9af13f 100644
--- a/src/.gitignore
+++ b/src/.gitignore
@@ -4,7 +4,9 @@ halt
 init
 killall5
 last
+logsave
 mesg
+readbootlog
 runlevel
 shutdown
 sulogin
diff --git a/src/Makefile b/src/Makefile
index 9f9f09e..4141cb8 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -90,14 +90,16 @@ else
 endif
 
 # Additional libs for GNU libc.
-ifneq ($(wildcard /usr/lib*/libcrypt.*),)
+ifneq ($(wildcard $(ROOT)/usr/lib*/libcrypt.*),)
   SULOGINLIBS	+= -lcrypt
 endif
 
 # Additional libs for GNU libc / multiarch on Debian based systems.
-ifneq ($(wildcard /usr/lib/*/libcrypt.*),)
+ifneq ($(wildcard $(ROOT)/usr/lib/*/libcrypt.*),)
+ifneq ($(findstring -lcrypt, $(SULOGINLIBS)), -lcrypt)
   SULOGINLIBS	+= -lcrypt
 endif
+endif
 
 all:		$(BIN) $(SBIN) $(USRBIN)