Skip to content

Commit

Permalink
Added xdd (belongs to vi) to the PROGS array because also tool to dis…
Browse files Browse the repository at this point in the history
…play binary files is needed in the recovery system
  • Loading branch information
jsmeix committed Dec 12, 2019
1 parent 0bdd428 commit 64fcb59
Showing 1 changed file with 12 additions and 14 deletions.
26 changes: 12 additions & 14 deletions usr/share/rear/conf/GNU/Linux.conf
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
# Architecture-independend Files
REQUIRED_PROGS=(
"${REQUIRED_PROGS[@]:-}"
REQUIRED_PROGS+=(
chroot
ip
less
Expand All @@ -9,17 +8,15 @@ route
readlink
)

PROGS=(
${PROGS[@]:-}
PROGS+=(
partprobe
fdisk
cfdisk
sfdisk
)

# progs to take along
PROGS=(
${PROGS[@]:-}
PROGS+=(
rpc.statd
rpcbind
mknod
Expand Down Expand Up @@ -72,6 +69,7 @@ ping
netstat
free
traceroute
xxd
vi
pico
nano
Expand Down Expand Up @@ -170,8 +168,7 @@ clear

# the lib* serves to cover both 32bit and 64bit libraries!
#
LIBS=(
${LIBS[@]:-}
LIBS+=(

### needed for username lookups
/lib*/libnss_dns*
Expand Down Expand Up @@ -208,7 +205,7 @@ ${LIBS[@]:-}
/usr/lib*/libnssdbm3.so*
)

COPY_AS_IS=( ${COPY_AS_IS[@]:-} /dev /etc/inputr[c] /etc/protocols /etc/services /etc/rpc /etc/termcap /etc/terminfo /lib*/terminfo /usr/share/terminfo /etc/netconfig /etc/mke2fs.conf /etc/*-release /etc/localtime /etc/magic /usr/share/misc/magic /etc/dracut.conf /etc/dracut.conf.d /usr/lib/dracut /sbin/modprobe.ksplice-orig /etc/sysctl.conf /etc/sysctl.d /etc/e2fsck.conf )
COPY_AS_IS+=( /dev /etc/inputr[c] /etc/protocols /etc/services /etc/rpc /etc/termcap /etc/terminfo /lib*/terminfo /usr/share/terminfo /etc/netconfig /etc/mke2fs.conf /etc/*-release /etc/localtime /etc/magic /usr/share/misc/magic /etc/dracut.conf /etc/dracut.conf.d /usr/lib/dracut /sbin/modprobe.ksplice-orig /etc/sysctl.conf /etc/sysctl.d /etc/e2fsck.conf )
# Required by curl with https:
# There are stored the distribution provided certificates
# installed from packages, nothing confidential.
Expand All @@ -220,15 +217,16 @@ COPY_AS_IS=( ${COPY_AS_IS[@]:-} /dev /etc/inputr[c] /etc/protocols /etc/services
# but somehow that does not work in practice, see also https://github.com/rear/rear/pull/1971
# so that /etc/ca-certificates/* is added in the old "known to somehow work" style
# that had been used before, cf. https://github.com/rear/rear/pull/1402
COPY_AS_IS=( "${COPY_AS_IS[@]}" '/etc/ssl/certs/*' '/etc/pki/*' '/usr/lib/ssl/*' '/usr/share/ca-certificates/*' '/etc/ca-certificates/*' )
COPY_AS_IS+=( '/etc/ssl/certs/*' '/etc/pki/*' '/usr/lib/ssl/*' '/usr/share/ca-certificates/*' '/etc/ca-certificates/*' )

# exclude /dev/shm/*, due to the way we use tar the leading / should be omitted
COPY_AS_IS_EXCLUDE=( ${COPY_AS_IS_EXCLUDE[@]:-} dev/shm/\* )
COPY_AS_IS_EXCLUDE+=( dev/shm/\* )
# Exclude private keys: /etc/pki/tls/private /etc/pki/CA/private /etc/pki/nssdb/key*.db and /usr/lib/ssl/private (cf. above):
COPY_AS_IS_EXCLUDE=( "${COPY_AS_IS_EXCLUDE[@]}" '/etc/pki/tls/private' '/etc/pki/CA/private' '/etc/pki/nssdb/key*.db' '/usr/lib/ssl/private' )
COPY_AS_IS_EXCLUDE+=( '/etc/pki/tls/private' '/etc/pki/CA/private' '/etc/pki/nssdb/key*.db' '/usr/lib/ssl/private' )

# some stuff for the Linux command line (the leading blank is needed to add it as a separated word to the KERNEL_CMDLINE string):
KERNEL_CMDLINE+=" selinux=0"

# some stuff for the Linux command line
KERNEL_CMDLINE="$KERNEL_CMDLINE selinux=0"
# common users and groups
CLONE_USERS+=( daemon rpc usbmuxd usbmux vcsa nobody dbus )
CLONE_GROUPS+=( tty usbmuxd usbmux fuse kvm oinstall dbus )
Expand Down

0 comments on commit 64fcb59

Please sign in to comment.