Browse Source

Puts yard_chrooted_tests in /usr/lib/bootroot since this program is gbootroot

specific, makes for a more policy correct package.
master
freesource 23 years ago
parent
commit
4050413657
  1. 2
      BootRoot/Yard.pm
  2. 5
      Makefile.pkg

2
BootRoot/Yard.pm

@ -1760,7 +1760,7 @@ sub which_tests {
my $t_scripts = $chosen_tests->{32}{test_scripts}; my $t_scripts = $chosen_tests->{32}{test_scripts};
return "ERROR" if errm(mount_device($device,$mount_point)) == 2; return "ERROR" if errm(mount_device($device,$mount_point)) == 2;
sys("yard_chrooted_tests $mount_point $t_fstab $t_inittab $t_scripts", sys("/usr/lib/bootroot/yard_chrooted_tests $mount_point $t_fstab $t_inittab $t_scripts",
"TESTING"); "TESTING");
return "ERROR" if errum(sys("umount $mount_point")) == 2; return "ERROR" if errum(sys("umount $mount_point")) == 2;

5
Makefile.pkg

@ -4,7 +4,8 @@ all: install
install: install:
install -d $(DESTDIR)/usr/bin install -d $(DESTDIR)/usr/bin
cp -fa gbootroot $(DESTDIR)/usr/bin/gbootroot cp -fa gbootroot $(DESTDIR)/usr/bin/gbootroot
cp -fa yard_chrooted_tests $(DESTDIR)/usr/bin/yard_chrooted_tests install -d $(DESTDIR)/usr/lib/bootroot
cp -fa yard_chrooted_tests $(DESTDIR)/usr/lib/bootroot/yard_chrooted_tests
cp -fa yard/scripts/make_debian $(DESTDIR)/usr/bin/make_debian cp -fa yard/scripts/make_debian $(DESTDIR)/usr/bin/make_debian
install -d $(DESTDIR)/usr/share/perl5/BootRoot install -d $(DESTDIR)/usr/share/perl5/BootRoot
cp -fa BootRoot/*.pm $(DESTDIR)/usr/share/perl5/BootRoot cp -fa BootRoot/*.pm $(DESTDIR)/usr/share/perl5/BootRoot
@ -25,7 +26,7 @@ install:
remove: remove:
rm /usr/bin/gbootroot rm /usr/bin/gbootroot
rm /usr/bin/yard_chrooted_tests rm /usr/lib/bootroot/yard_chrooted_tests
rm /usr/bin/make_debian rm /usr/bin/make_debian
rm /usr/share/perl5/BootRoot/* rm /usr/share/perl5/BootRoot/*
rmdir /usr/share/perl5/BootRoot rmdir /usr/share/perl5/BootRoot

Loading…
Cancel
Save