summaryrefslogtreecommitdiffstats
path: root/images/make_boot_img
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2012-01-05 21:23:21 +0000
committerThierry Vignaud <tv@mageia.org>2012-01-05 21:23:21 +0000
commit13d770e9bcf1bd5d0baea6f534512b598ea206b6 (patch)
treebb0f21b6476099fc33f63866ffa795a122d628de /images/make_boot_img
parent67f9847f4044f13fc632a109ac82e2da1b42a6ea (diff)
downloaddrakx-backup-do-not-use-13d770e9bcf1bd5d0baea6f534512b598ea206b6.tar
drakx-backup-do-not-use-13d770e9bcf1bd5d0baea6f534512b598ea206b6.tar.gz
drakx-backup-do-not-use-13d770e9bcf1bd5d0baea6f534512b598ea206b6.tar.bz2
drakx-backup-do-not-use-13d770e9bcf1bd5d0baea6f534512b598ea206b6.tar.xz
drakx-backup-do-not-use-13d770e9bcf1bd5d0baea6f534512b598ea206b6.zip
use upstream pppd & pppoe instead of a 10 years old snapshot
Diffstat (limited to 'images/make_boot_img')
-rwxr-xr-ximages/make_boot_img5
1 files changed, 3 insertions, 2 deletions
diff --git a/images/make_boot_img b/images/make_boot_img
index 034d2b0cf..b07817994 100755
--- a/images/make_boot_img
+++ b/images/make_boot_img
@@ -187,8 +187,9 @@ fi
_ "chmod 755 $tmp_initrd/hotplug";
symlink "../hotplug", "$tmp_initrd/sbin/hotplug";
_ "install $stage1_root/init $tmp_initrd/";
- foreach ('stage1', 'pppd', 'pppoe') {
- _ "install $stage1_root/$_ $tmp_initrd/sbin/";
+ _ "install $stage1_root/stage1 $tmp_initrd/sbin/";
+ foreach ('pppd', 'pppoe') {
+ _ "install /usr/sbin/${_}-diet $tmp_initrd/sbin/$_";
}
if ($arch !~ /ppc|ia64/) {