Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

moved PROGS from GNU/Linux.conf to default.conf REQUIRED_PROGS #892 #1961

Merged
merged 1 commit into from Nov 9, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
31 changes: 5 additions & 26 deletions usr/share/rear/conf/GNU/Linux.conf
@@ -1,7 +1,12 @@
# Architecture-independend Files
REQUIRED_PROGS=(
"${REQUIRED_PROGS[@]:-}"
chroot
ip
less
parted
route
Copy link
Member

@pcahyna pcahyna Dec 10, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This broke ReaR on some CentOS installs (like the CentOS 7 Vagrant image). route is not installed every time nowadays, as it is considered legacy. ReaR seems to use properly ip route everywhere, so route should not be required and should stay in PROGS.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed via #2297

readlink
)

PROGS=(
Expand All @@ -17,52 +22,34 @@ PROGS=(
${PROGS[@]:-}
rpc.statd
rpcbind
bash
mknod
blkid
vol_id
udev_volume_id
portmap
readlink
rpcinfo
grep
cat
tac
tr
reboot
halt
shutdown
killall5
killall
chroot
tee
awk
ip
ifconfig
nslookup
route
ifenslave
ifrename
nameif
klogd
syslog-ng
syslogd
rsyslogd
echo
cp
date
wc
cut
rm
rmdir
test
init
telinit
ethtool
expand
sed
mount
umount
insmod
modprobe
lsmod
Expand All @@ -76,27 +63,22 @@ hostname
uname
sleep
logger
ps
pstree
ln
dirname
basename
mkdir
tty
ping
netstat
free
traceroute
less
vi
pico
nano
rmmod
df
ls
dmesg
du
tar
gzip
netcat
curl
Expand Down Expand Up @@ -144,9 +126,7 @@ xfs_growfs
btrfs
jfs_tune
reiserfstune
expr
egrep
grep
fgrep
chmod
chown
Expand Down Expand Up @@ -177,7 +157,6 @@ attr
getfattr
setfattr
mpath_wait
strings
xargs
sg_inq
env
Expand Down
44 changes: 29 additions & 15 deletions usr/share/rear/conf/default.conf
Expand Up @@ -991,30 +991,44 @@ PROGS=( )
# Same as above, but if they are missing, we abort.
REQUIRED_PROGS=(
"$SCRIPT_FILE"
bash
awk
bash
bc
cat
cmp
cp
cpio
cut
dd
diff
df
dumpkeys
echo
expr
file
getopt
ip
tar
sort
mv
uniq
grep
loadkeys
kbd_mode
dumpkeys
diff
cmp
join
pwd
file
kbd_mode
loadkeys
ls
mkdir
mount
mv
pidof
sync
ps
pwd
rm
sed
sort
strings
bc
sync
tar
test
tr
umount
uniq
wc
)

# Library files to include in the rescue/recovery system:
Expand Down