From 13d770e9bcf1bd5d0baea6f534512b598ea206b6 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tv@mageia.org>
Date: Thu, 5 Jan 2012 21:23:21 +0000
Subject: use upstream pppd & pppoe instead of a 10 years old snapshot

---
 images/NEWS          | 2 ++
 images/make_boot_img | 5 +++--
 2 files changed, 5 insertions(+), 2 deletions(-)

(limited to 'images')

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/) {
-- 
cgit v1.2.1