diff options
| author | Colin Guthrie <colin@mageia.org> | 2014-08-30 12:09:08 +0100 |
|---|---|---|
| committer | Colin Guthrie <colin@mageia.org> | 2014-08-30 12:09:08 +0100 |
| commit | ea427ad757e8b7c2c4bf7a2cd4176ebaefcbf3be (patch) | |
| tree | 5913ccda5f0cf4e3e62fd2d0b070bef9b357a9b5 /usr/lib | |
| parent | f7d3fead844d504c88ef4bd2bd3b2a5d168cd1eb (diff) | |
| parent | e2d575550ef975cb3cf5456060d75a66cd63aee4 (diff) | |
| download | initscripts-ea427ad757e8b7c2c4bf7a2cd4176ebaefcbf3be.tar initscripts-ea427ad757e8b7c2c4bf7a2cd4176ebaefcbf3be.tar.gz initscripts-ea427ad757e8b7c2c4bf7a2cd4176ebaefcbf3be.tar.bz2 initscripts-ea427ad757e8b7c2c4bf7a2cd4176ebaefcbf3be.tar.xz initscripts-ea427ad757e8b7c2c4bf7a2cd4176ebaefcbf3be.zip | |
Merge tag 'initscripts-9.55-1' into distro/mga
Tag as initscripts-9.55-1
Conflicts:
Makefile
lang.csh
lang.sh
po/Makefile
ppp/ip-down
ppp/ip-up
rc.d/init.d/network
service
sysconfig.txt
sysconfig/init
sysconfig/network-scripts/ifdown-ppp
sysconfig/network-scripts/ifup
sysconfig/network-scripts/ifup-eth
sysconfig/network-scripts/ifup-ippp
sysconfig/network-scripts/ifup-ppp
sysconfig/network-scripts/ifup-wireless
sysconfig/network-scripts/network-functions
sysctl.conf
systemd/fedora-storage-init
Notes:
ppp support was dropped upstream so we will need to merge
it into the ppp package as Fedora has done.
The fedora-storage-init stuff has been dropped. LVM+Raid
is typically initialised automatically now via udev rules
etc. We should try and follow suit, but may need to add
the legacy script back in for now.
Diffstat (limited to 'usr/lib')
0 files changed, 0 insertions, 0 deletions