webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-16 05:53:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next

Browse Source
This commit is contained in:
Arne Fitzenreiter
2018-12-07 21:06:45 +01:00
parent 23a3aec100 f354601bbe
commit d05fe8e3e5
7 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/rootfiles/common/aarch64/initscripts
View File

@@ -184,11 +184,11 @@ etc/rc.d/rcsysinit.d/S45udev_retry
etc/rc.d/rcsysinit.d/S50cleanfs
etc/rc.d/rcsysinit.d/S60setclock
etc/rc.d/rcsysinit.d/S70console
etc/rc.d/rcsysinit.d/S71pakfire
etc/rc.d/rcsysinit.d/S73swconfig
etc/rc.d/rcsysinit.d/S74aws
etc/rc.d/rcsysinit.d/S75firstsetup
etc/rc.d/rcsysinit.d/S80localnet
etc/rc.d/rcsysinit.d/S81pakfire
etc/rc.d/rcsysinit.d/S85firewall
etc/rc.d/rcsysinit.d/S92rngd
#etc/sysconfig

2
config/rootfiles/common/armv5tel/initscripts
View File

@@ -184,11 +184,11 @@ etc/rc.d/rcsysinit.d/S45udev_retry
etc/rc.d/rcsysinit.d/S50cleanfs
etc/rc.d/rcsysinit.d/S60setclock
etc/rc.d/rcsysinit.d/S70console
etc/rc.d/rcsysinit.d/S71pakfire
etc/rc.d/rcsysinit.d/S73swconfig
etc/rc.d/rcsysinit.d/S74aws
etc/rc.d/rcsysinit.d/S75firstsetup
etc/rc.d/rcsysinit.d/S80localnet
etc/rc.d/rcsysinit.d/S81pakfire
etc/rc.d/rcsysinit.d/S85firewall
etc/rc.d/rcsysinit.d/S92rngd
#etc/sysconfig

2
config/rootfiles/common/i586/initscripts
View File

@@ -183,10 +183,10 @@ etc/rc.d/rcsysinit.d/S45udev_retry
etc/rc.d/rcsysinit.d/S50cleanfs
etc/rc.d/rcsysinit.d/S60setclock
etc/rc.d/rcsysinit.d/S70console
etc/rc.d/rcsysinit.d/S71pakfire
etc/rc.d/rcsysinit.d/S74aws
etc/rc.d/rcsysinit.d/S75firstsetup
etc/rc.d/rcsysinit.d/S80localnet
etc/rc.d/rcsysinit.d/S81pakfire
etc/rc.d/rcsysinit.d/S85firewall
etc/rc.d/rcsysinit.d/S92rngd
#etc/sysconfig

2
config/rootfiles/common/x86_64/initscripts
View File

@@ -183,10 +183,10 @@ etc/rc.d/rcsysinit.d/S45udev_retry
etc/rc.d/rcsysinit.d/S50cleanfs
etc/rc.d/rcsysinit.d/S60setclock
etc/rc.d/rcsysinit.d/S70console
etc/rc.d/rcsysinit.d/S71pakfire
etc/rc.d/rcsysinit.d/S74aws
etc/rc.d/rcsysinit.d/S75firstsetup
etc/rc.d/rcsysinit.d/S80localnet
etc/rc.d/rcsysinit.d/S81pakfire
etc/rc.d/rcsysinit.d/S85firewall
etc/rc.d/rcsysinit.d/S92rngd
#etc/sysconfig

1
config/rootfiles/core/126/filelists/files
View File

@@ -1,6 +1,7 @@
etc/system-release
etc/issue
etc/rc.d/init.d/rngd
etc/rc.d/rcsysinit.d/S71pakfire
lib/udev/rules.d/90-hwrng.rules
srv/web/ipfire/cgi-bin/credits.cgi
var/ipfire/langs

1
config/rootfiles/core/126/update.sh
View File

@@ -82,6 +82,7 @@ rm -f /etc/sysconfig/lm_sensors
# Stop services
# Remove files
rm -vf /etc/rc.d/rcsysinit.d/S81pakfire
# Extract files
extract_files

2
lfs/initscripts
View File

@@ -172,10 +172,10 @@ $(TARGET) :
ln -sf ../init.d/setclock /etc/rc.d/rc0.d/K47setclock
ln -sf ../init.d/setclock /etc/rc.d/rc6.d/K47setclock
ln -sf ../init.d/console /etc/rc.d/rcsysinit.d/S70console
ln -sf ../init.d/pakfire /etc/rc.d/rcsysinit.d/S71pakfire
ln -sf ../init.d/aws /etc/rc.d/rcsysinit.d/S74aws
ln -sf ../init.d/firstsetup /etc/rc.d/rcsysinit.d/S75firstsetup
ln -sf ../init.d/localnet /etc/rc.d/rcsysinit.d/S80localnet
ln -sf ../init.d/pakfire /etc/rc.d/rcsysinit.d/S81pakfire
ln -sf ../init.d/firewall /etc/rc.d/rcsysinit.d/S85firewall
ln -sf ../init.d/rngd /etc/rc.d/rcsysinit.d/S92rngd
ln -sf ../init.d/vnstat /etc/rc.d/rc3.d/S01vnstat