summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--images/NEWS2
-rwxr-xr-ximages/make_boot_img5
2 files changed, 5 insertions, 2 deletions
diff --git a/images/NEWS b/images/NEWS
index 362074d96..7324f770c 100644
--- a/images/NEWS
+++ b/images/NEWS
@@ -1,3 +1,5 @@
+- use upstream pppd & pppoe instead of a 10 years old snapshot
+
Version 1.59 - 29 December 2011 by Thomas Backlund
- sync with kernel-3.2.0-0.rc7.1.mga2
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/) {