Fix patches
This commit is contained in:
parent
fd0b98268c
commit
e54af3486b
9 changed files with 20 additions and 34 deletions
|
@ -1,5 +1,5 @@
|
||||||
--- stage0.orig/rootfs/etc/skel/.bashrc
|
--- rootfs.orig/etc/skel/.bashrc
|
||||||
+++ stage0/rootfs/etc/skel/.bashrc
|
+++ rootfs/etc/skel/.bashrc
|
||||||
@@ -43,7 +43,7 @@ esac
|
@@ -43,7 +43,7 @@ esac
|
||||||
# uncomment for a colored prompt, if the terminal has the capability; turned
|
# 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
|
# off by default to not distract the user: the focus in a terminal window
|
||||||
|
|
|
@ -1,7 +1,5 @@
|
||||||
Index: 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
|
||||||
--- 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
|
|
||||||
@@ -22,7 +22,7 @@ IMPORT{cmdline}="net.ifnames"
|
@@ -22,7 +22,7 @@ IMPORT{cmdline}="net.ifnames"
|
||||||
ENV{net.ifnames}=="1", GOTO="persistent_net_generator_end"
|
ENV{net.ifnames}=="1", GOTO="persistent_net_generator_end"
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
--- stage3.orig/rootfs/etc/ssh/sshd_config
|
--- rootfs.orig/etc/ssh/sshd_config
|
||||||
+++ stage3/rootfs/etc/ssh/sshd_config
|
+++ rootfs/etc/ssh/sshd_config
|
||||||
@@ -25,7 +25,7 @@ LogLevel INFO
|
@@ -25,7 +25,7 @@ LogLevel INFO
|
||||||
|
|
||||||
# Authentication:
|
# Authentication:
|
||||||
|
|
|
@ -1,7 +1,5 @@
|
||||||
Index: jessie-stage2/rootfs/etc/default/useradd
|
--- rootfs.orig/etc/default/useradd
|
||||||
===================================================================
|
+++ rootfs/etc/default/useradd
|
||||||
--- jessie-stage2.orig/rootfs/etc/default/useradd
|
|
||||||
+++ jessie-stage2/rootfs/etc/default/useradd
|
|
||||||
@@ -5,7 +5,7 @@
|
@@ -5,7 +5,7 @@
|
||||||
# Similar to DHSELL in adduser. However, we use "sh" here because
|
# Similar to DHSELL in adduser. However, we use "sh" here because
|
||||||
# useradd is a low level utility and should be as general
|
# useradd is a low level utility and should be as general
|
||||||
|
|
|
@ -1,7 +1,5 @@
|
||||||
Index: jessie-stage2/rootfs/etc/dphys-swapfile
|
--- rootfs.orig/etc/dphys-swapfile
|
||||||
===================================================================
|
+++ rootfs/etc/dphys-swapfile
|
||||||
--- jessie-stage2.orig/rootfs/etc/dphys-swapfile
|
|
||||||
+++ jessie-stage2/rootfs/etc/dphys-swapfile
|
|
||||||
@@ -13,7 +13,7 @@
|
@@ -13,7 +13,7 @@
|
||||||
|
|
||||||
# set size to absolute value, leaving empty (default) then uses computed value
|
# set size to absolute value, leaving empty (default) then uses computed value
|
||||||
|
|
|
@ -1,7 +1,5 @@
|
||||||
Index: jessie-stage2/rootfs/etc/inputrc
|
--- rootfs.orig/etc/inputrc
|
||||||
===================================================================
|
+++ rootfs/etc/inputrc
|
||||||
--- jessie-stage2.orig/rootfs/etc/inputrc
|
|
||||||
+++ jessie-stage2/rootfs/etc/inputrc
|
|
||||||
@@ -65,3 +65,7 @@ $endif
|
@@ -65,3 +65,7 @@ $endif
|
||||||
# "\e[F": end-of-line
|
# "\e[F": end-of-line
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,5 @@
|
||||||
Index: jessie-stage2/rootfs/etc/login.defs
|
--- rootfs.orig/etc/login.defs
|
||||||
===================================================================
|
+++ rootfs/etc/login.defs
|
||||||
--- jessie-stage2.orig/rootfs/etc/login.defs
|
|
||||||
+++ jessie-stage2/rootfs/etc/login.defs
|
|
||||||
@@ -100,7 +100,7 @@ HUSHLOGIN_FILE .hushlogin
|
@@ -100,7 +100,7 @@ HUSHLOGIN_FILE .hushlogin
|
||||||
#
|
#
|
||||||
# (they are minimal, add the rest in the shell startup files)
|
# (they are minimal, add the rest in the shell startup files)
|
||||||
|
@ -11,10 +9,8 @@ Index: jessie-stage2/rootfs/etc/login.defs
|
||||||
|
|
||||||
#
|
#
|
||||||
# Terminal permissions
|
# Terminal permissions
|
||||||
Index: jessie-stage2/rootfs/etc/profile
|
--- rootfs.orig/etc/profile
|
||||||
===================================================================
|
+++ rootfs/etc/profile
|
||||||
--- jessie-stage2.orig/rootfs/etc/profile
|
|
||||||
+++ jessie-stage2/rootfs/etc/profile
|
|
||||||
@@ -4,7 +4,7 @@
|
@@ -4,7 +4,7 @@
|
||||||
if [ "`id -u`" -eq 0 ]; then
|
if [ "`id -u`" -eq 0 ]; then
|
||||||
PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
|
PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
|
||||||
|
|
|
@ -1,7 +1,5 @@
|
||||||
Index: jessie-stage2/rootfs/etc/rc.local
|
--- rootfs.orig/etc/rc.local
|
||||||
===================================================================
|
+++ rootfs/etc/rc.local
|
||||||
--- jessie-stage2.orig/rootfs/etc/rc.local
|
|
||||||
+++ jessie-stage2/rootfs/etc/rc.local
|
|
||||||
@@ -11,4 +11,10 @@
|
@@ -11,4 +11,10 @@
|
||||||
#
|
#
|
||||||
# By default this script does nothing.
|
# By default this script does nothing.
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
--- a/rootfs/boot/cmdline.txt
|
--- root.orig/boot/cmdline.txt
|
||||||
+++ b/rootfs/boot/cmdline.txt
|
+++ root/boot/cmdline.txt
|
||||||
@@ -1 +1 @@
|
@@ -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
|
||||||
+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
|
+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
|
||||||
|
|
Reference in a new issue