Skip to content

Commit

Permalink
remove very old checks
Browse files Browse the repository at this point in the history
  • Loading branch information
Thomas Lange committed Oct 15, 2015
1 parent eeedcb4 commit e5d05fc
Showing 1 changed file with 1 addition and 18 deletions.
19 changes: 1 addition & 18 deletions bin/fai-make-nfsroot
Expand Up @@ -79,16 +79,6 @@ check_nfsroot() {
return 0
}
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
badupdateto32() {

cat <<-EOF
It seems that you have updated an older FAI version without checking files in /etc/fai/
Please check the NEWS file for changes in variable names and if you have a linux-image package
defined in /etc/fai/NFSROOT.
EOF
die 1 $@
}
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

PATH=/usr/local/bin:/usr/local/sbin:/bin:/sbin:/usr/bin:/usr/sbin

Expand Down Expand Up @@ -144,16 +134,9 @@ cfdir=$(readlink -f $cfdir) # canonicalize path
. $cfdir/nfsroot.conf

# IMO this may be removed, since all information should be included into sources.list
[ -n "$FAI_LOCAL_REPOSITORY" ] && die 1 "The use of \$FAI_LOCAL_REPOSITORY is now deprecated. Please include this information into sources.list."
[ -n "$packages" ] && badupdateto32 "The use of \$packages in nfsroot.conf is now deprecated. Please include this information into $cfdir/NFSROOT."
[ -n "$NFSROOT_PACKAGES" ] && die 1 "The use of \$NFSROOT_PACKAGES in nfsroot.conf is now deprecated. Please include this information into $cfdir/NFSROOT."
[ -n "$FAI_SOURCES_LIST" ] && die 1 "The use of \$FAI_SOURCES_LIST is deprecated. Please use sources.list now."

[ -z "$NFSROOT" ] && die 1 "\$NFSROOT is not set. Please check your settings in $cfdir/nfsroot.conf."
[ -z "$TFTPROOT" ] && badupdateto32 "\$TFTPROOT is not set. Please check your settings in $cfdir/nfsroot.conf."
[ -n "$KERNELPACKAGE" ] && badupdateto32 "The use of \$KERNELPACKAGE is deprecated. Please use $cfdir/NFSROOT now."
[ -z "$TFTPROOT" ] && die 1 "\$TFTPROOT is not set. Please check your settings in $cfdir/nfsroot.conf."
[ ! -d "$cfdir/apt" ] && die 1 "$cfdir/apt/ does not exists. Can't continue."
[ -n "$FAI_BOOT" ] && die 1 "Variable \$FAI_BOOT is not supported any more. Will only set up TFTP environment."

oldnfsroot=$NFSROOT
deldir=$NFSROOT
Expand Down

0 comments on commit e5d05fc

Please sign in to comment.