Skip to content

Commit

Permalink
Revert "copy sources.list from nfsroot to nfsroot.list"
Browse files Browse the repository at this point in the history
This reverts commit 014ce6f.
  • Loading branch information
Mrfai committed Jan 14, 2024
1 parent 09e913f commit 898e379
Showing 1 changed file with 1 addition and 5 deletions.
6 changes: 1 addition & 5 deletions lib/subroutines
Original file line number Diff line number Diff line change
Expand Up @@ -1202,10 +1202,7 @@ task_repository () {

# apt specific things
if ! fcopy -SBM $v /etc/apt/sources.list; then
if [ -f $FAI_ETC_DIR/apt/sources.list ]; then
cp $v $FAI_ETC_DIR/apt/sources.list $target/etc/apt/sources.list.d/nfsroot.list
rm -f $target/etc/apt/sources.list
fi
[ -f $FAI_ETC_DIR/apt/sources.list ] && cp $v $FAI_ETC_DIR/apt/sources.list $FAI_ROOT/etc/apt
fi
if ! fcopy -BM $v /etc/apt/preferences; then
[ -f $FAI_ETC_DIR/apt/preferences ] && cp $v $FAI_ETC_DIR/apt/preferences $FAI_ROOT/etc/apt
Expand Down Expand Up @@ -1287,7 +1284,6 @@ task_finish() {
# undo fake of all programs made by fai
fai-divert -R
rm -f $FAI_ROOT/etc/apt/apt.conf.d/{10,90}fai
rm -f $target/etc/apt/sources.list.d/nfsroot.list
echo -n "FAI finished at: ";date
echo "The $FAI_ACTION took $(($(cut -d . -f 1 /proc/uptime) - start_seconds)) seconds."
}
Expand Down

0 comments on commit 898e379

Please sign in to comment.