Browse Source

No longer install any files in /lib/. Closes: #1073743

Christoph Biedl 8 months ago
parent
commit
510d5e6bf8
3 changed files with 13 additions and 7 deletions
  1. 11 5
      debian/patches/improve-init-scripts.patch
  2. 1 1
      debian/rules
  3. 1 1
      debian/vblade.install

+ 11 - 5
debian/patches/improve-init-scripts.patch

@@ -64,10 +64,17 @@ Forwarded: not-yet
          status)
          status)
 --- a/contrib/persistence/vblade.init.lsb-daemon
 --- a/contrib/persistence/vblade.init.lsb-daemon
 +++ b/contrib/persistence/vblade.init.lsb-daemon
 +++ b/contrib/persistence/vblade.init.lsb-daemon
-@@ -30,6 +30,14 @@
- # Define LSB functions
- . /lib/lsb/init-functions
+@@ -25,10 +25,18 @@
+ mkdir -p "$PIDDIR"
+ 
+ # Load the VERBOSE setting and other rcS variables
+-. /lib/init/vars.sh
++. /usr/lib/init/vars.sh
  
  
+ # Define LSB functions
+-. /lib/lsb/init-functions
++. /usr/lib/lsb/init-functions
++
 +missing () {
 +missing () {
 +    local MESSAGE
 +    local MESSAGE
 +
 +
@@ -75,10 +82,9 @@ Forwarded: not-yet
 +    [ "$VERBOSE" != no ] && log_daemon_msg "$INSTANCE.conf" "$MESSAGE"
 +    [ "$VERBOSE" != no ] && log_daemon_msg "$INSTANCE.conf" "$MESSAGE"
 +    return 1
 +    return 1
 +}
 +}
-+
+ 
  # Start a vblade instance
  # Start a vblade instance
  #
  #
- # Return
 @@ -37,8 +45,10 @@
 @@ -37,8 +45,10 @@
  #   1 if daemon was already running
  #   1 if daemon was already running
  #   2 if daemon could not be started
  #   2 if daemon could not be started

+ 1 - 1
debian/rules

@@ -35,4 +35,4 @@ override_dh_installman:
 # needed as long as vblade-generator is provided by a patch
 # needed as long as vblade-generator is provided by a patch
 override_dh_fixperms:
 override_dh_fixperms:
 	dh_fixperms
 	dh_fixperms
-	chmod 0755 debian/vblade/lib/systemd/system-generators/vblade-generator
+	chmod 0755 debian/vblade/usr/lib/systemd/system-generators/vblade-generator

+ 1 - 1
debian/vblade.install

@@ -2,6 +2,6 @@
 vblade  usr/sbin/
 vblade  usr/sbin/
 vbladed usr/sbin/
 vbladed usr/sbin/
 
 
-contrib/persistence/vblade-generator    lib/systemd/system-generators/
+contrib/persistence/vblade-generator    usr/lib/systemd/system-generators/
 debian/skeleton.conf                    etc/vblade.conf.d/
 debian/skeleton.conf                    etc/vblade.conf.d/
 debian/vblade-persist-convert           usr/share/vblade/
 debian/vblade-persist-convert           usr/share/vblade/