From e54af3486b182640290caf52320d40fe3f3884d2 Mon Sep 17 00:00:00 2001 From: Braiden Vasco Date: Mon, 3 Jul 2017 03:52:02 +0000 Subject: [PATCH] Fix patches --- stage0/00-substage/01-patches/01-bashrc.diff | 4 ++-- stage0/00-substage/01-patches/02-persistant-net.diff | 6 ++---- stage0/00-substage/01-patches/03-no-root-login.diff | 4 ++-- stage0/00-substage/11-patches/01-useradd.diff | 6 ++---- stage0/00-substage/11-patches/02-swap.diff | 6 ++---- stage0/00-substage/11-patches/04-inputrc.diff | 6 ++---- stage0/00-substage/11-patches/05-path.diff | 12 ++++-------- stage0/00-substage/11-patches/06-rc_local.diff | 6 ++---- stage0/00-substage/11-patches/07-resize-init.diff | 4 ++-- 9 files changed, 20 insertions(+), 34 deletions(-) diff --git a/stage0/00-substage/01-patches/01-bashrc.diff b/stage0/00-substage/01-patches/01-bashrc.diff index 616da40..619e5e2 100644 --- a/stage0/00-substage/01-patches/01-bashrc.diff +++ b/stage0/00-substage/01-patches/01-bashrc.diff @@ -1,5 +1,5 @@ ---- stage0.orig/rootfs/etc/skel/.bashrc -+++ stage0/rootfs/etc/skel/.bashrc +--- rootfs.orig/etc/skel/.bashrc ++++ rootfs/etc/skel/.bashrc @@ -43,7 +43,7 @@ esac # uncomment for a colored prompt, if the terminal has the capability; turned # off by default to not distract the user: the focus in a terminal window diff --git a/stage0/00-substage/01-patches/02-persistant-net.diff b/stage0/00-substage/01-patches/02-persistant-net.diff index 1e6a975..b0f2dee 100644 --- a/stage0/00-substage/01-patches/02-persistant-net.diff +++ b/stage0/00-substage/01-patches/02-persistant-net.diff @@ -1,7 +1,5 @@ -Index: jessie-stage1/rootfs/lib/udev/rules.d/75-persistent-net-generator.rules -=================================================================== ---- jessie-stage1.orig/rootfs/lib/udev/rules.d/75-persistent-net-generator.rules -+++ jessie-stage1/rootfs/lib/udev/rules.d/75-persistent-net-generator.rules +--- rootfs.orig/lib/udev/rules.d/75-persistent-net-generator.rules ++++ rootfs/lib/udev/rules.d/75-persistent-net-generator.rules @@ -22,7 +22,7 @@ IMPORT{cmdline}="net.ifnames" ENV{net.ifnames}=="1", GOTO="persistent_net_generator_end" diff --git a/stage0/00-substage/01-patches/03-no-root-login.diff b/stage0/00-substage/01-patches/03-no-root-login.diff index b066d6d..ca1cc0e 100644 --- a/stage0/00-substage/01-patches/03-no-root-login.diff +++ b/stage0/00-substage/01-patches/03-no-root-login.diff @@ -1,5 +1,5 @@ ---- stage3.orig/rootfs/etc/ssh/sshd_config -+++ stage3/rootfs/etc/ssh/sshd_config +--- rootfs.orig/etc/ssh/sshd_config ++++ rootfs/etc/ssh/sshd_config @@ -25,7 +25,7 @@ LogLevel INFO # Authentication: diff --git a/stage0/00-substage/11-patches/01-useradd.diff b/stage0/00-substage/11-patches/01-useradd.diff index e81ad5a..b39621d 100644 --- a/stage0/00-substage/11-patches/01-useradd.diff +++ b/stage0/00-substage/11-patches/01-useradd.diff @@ -1,7 +1,5 @@ -Index: jessie-stage2/rootfs/etc/default/useradd -=================================================================== ---- jessie-stage2.orig/rootfs/etc/default/useradd -+++ jessie-stage2/rootfs/etc/default/useradd +--- rootfs.orig/etc/default/useradd ++++ rootfs/etc/default/useradd @@ -5,7 +5,7 @@ # Similar to DHSELL in adduser. However, we use "sh" here because # useradd is a low level utility and should be as general diff --git a/stage0/00-substage/11-patches/02-swap.diff b/stage0/00-substage/11-patches/02-swap.diff index 745a344..55956dc 100644 --- a/stage0/00-substage/11-patches/02-swap.diff +++ b/stage0/00-substage/11-patches/02-swap.diff @@ -1,7 +1,5 @@ -Index: jessie-stage2/rootfs/etc/dphys-swapfile -=================================================================== ---- jessie-stage2.orig/rootfs/etc/dphys-swapfile -+++ jessie-stage2/rootfs/etc/dphys-swapfile +--- rootfs.orig/etc/dphys-swapfile ++++ rootfs/etc/dphys-swapfile @@ -13,7 +13,7 @@ # set size to absolute value, leaving empty (default) then uses computed value diff --git a/stage0/00-substage/11-patches/04-inputrc.diff b/stage0/00-substage/11-patches/04-inputrc.diff index c81fa62..2934e82 100644 --- a/stage0/00-substage/11-patches/04-inputrc.diff +++ b/stage0/00-substage/11-patches/04-inputrc.diff @@ -1,7 +1,5 @@ -Index: jessie-stage2/rootfs/etc/inputrc -=================================================================== ---- jessie-stage2.orig/rootfs/etc/inputrc -+++ jessie-stage2/rootfs/etc/inputrc +--- rootfs.orig/etc/inputrc ++++ rootfs/etc/inputrc @@ -65,3 +65,7 @@ $endif # "\e[F": end-of-line diff --git a/stage0/00-substage/11-patches/05-path.diff b/stage0/00-substage/11-patches/05-path.diff index 25b80a1..b3cdffe 100644 --- a/stage0/00-substage/11-patches/05-path.diff +++ b/stage0/00-substage/11-patches/05-path.diff @@ -1,7 +1,5 @@ -Index: jessie-stage2/rootfs/etc/login.defs -=================================================================== ---- jessie-stage2.orig/rootfs/etc/login.defs -+++ jessie-stage2/rootfs/etc/login.defs +--- rootfs.orig/etc/login.defs ++++ rootfs/etc/login.defs @@ -100,7 +100,7 @@ HUSHLOGIN_FILE .hushlogin # # (they are minimal, add the rest in the shell startup files) @@ -11,10 +9,8 @@ Index: jessie-stage2/rootfs/etc/login.defs # # Terminal permissions -Index: jessie-stage2/rootfs/etc/profile -=================================================================== ---- jessie-stage2.orig/rootfs/etc/profile -+++ jessie-stage2/rootfs/etc/profile +--- rootfs.orig/etc/profile ++++ rootfs/etc/profile @@ -4,7 +4,7 @@ if [ "`id -u`" -eq 0 ]; then PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" diff --git a/stage0/00-substage/11-patches/06-rc_local.diff b/stage0/00-substage/11-patches/06-rc_local.diff index 98b44b8..21ac5f8 100644 --- a/stage0/00-substage/11-patches/06-rc_local.diff +++ b/stage0/00-substage/11-patches/06-rc_local.diff @@ -1,7 +1,5 @@ -Index: jessie-stage2/rootfs/etc/rc.local -=================================================================== ---- jessie-stage2.orig/rootfs/etc/rc.local -+++ jessie-stage2/rootfs/etc/rc.local +--- rootfs.orig/etc/rc.local ++++ rootfs/etc/rc.local @@ -11,4 +11,10 @@ # # By default this script does nothing. diff --git a/stage0/00-substage/11-patches/07-resize-init.diff b/stage0/00-substage/11-patches/07-resize-init.diff index 0701641..4fb539a 100644 --- a/stage0/00-substage/11-patches/07-resize-init.diff +++ b/stage0/00-substage/11-patches/07-resize-init.diff @@ -1,5 +1,5 @@ ---- a/rootfs/boot/cmdline.txt -+++ b/rootfs/boot/cmdline.txt +--- root.orig/boot/cmdline.txt ++++ root/boot/cmdline.txt @@ -1 +1 @@ -dwc_otg.lpm_enable=0 console=serial0,115200 console=tty1 root=ROOTDEV rootfstype=ext4 elevator=deadline fsck.repair=yes rootwait +dwc_otg.lpm_enable=0 console=serial0,115200 console=tty1 root=ROOTDEV rootfstype=ext4 elevator=deadline fsck.repair=yes rootwait quiet init=/usr/lib/raspi-config/init_resize.sh