From 442045a81b50153d848516b1638bb43d8c546308 Mon Sep 17 00:00:00 2001 From: Sascha Wildner Date: Thu, 15 Jan 2009 16:40:30 +0100 Subject: [PATCH] Remove /lib from the copy sources and sync internal table. --- .../src/backend/installer/fn_install.c | 52 +++++++++---------- .../local/share/dfuibe_installer/sources.conf | 1 - 2 files changed, 24 insertions(+), 29 deletions(-) diff --git a/contrib/bsdinstaller-1.1.6/src/backend/installer/fn_install.c b/contrib/bsdinstaller-1.1.6/src/backend/installer/fn_install.c index f2ffead769..47d1c5eb5f 100644 --- a/contrib/bsdinstaller-1.1.6/src/backend/installer/fn_install.c +++ b/contrib/bsdinstaller-1.1.6/src/backend/installer/fn_install.c @@ -146,34 +146,30 @@ fn_install_os(struct i_fn_args *a) if (!is_file("%s%s", a->os_root, SOURCES_CONF_FILE)) { i_log(a, "Using internal copy sources table."); strcpy(cp_src[0],"/COPYRIGHT"); - strcpy(cp_src[1],"/var"); - strcpy(cp_src[2],"/bin"); - strcpy(cp_src[3],"/boot"); - strcpy(cp_src[4],"/cdrom"); - strcpy(cp_src[5],"/dev"); - strcpy(cp_src[6],"/etc"); - strcpy(cp_src[7],"/libexec"); - strcpy(cp_src[8],"/lib"); - strcpy(cp_src[9],"/kernel"); - strcpy(cp_src[10],"/modules"); - strcpy(cp_src[11],"/root"); - strcpy(cp_src[12],"/sbin"); - strcpy(cp_src[13],"/sys"); - strcpy(cp_src[14],"/tmp"); - strcpy(cp_src[15],"/usr/bin"); - strcpy(cp_src[16],"/usr/games"); - strcpy(cp_src[17],"/usr/include"); - strcpy(cp_src[18],"/usr/lib"); - strcpy(cp_src[19],"/usr/local"); - strcpy(cp_src[20],"/usr/local/OpenOffice.org1.1.3"); - strcpy(cp_src[21],"/usr/X11R6"); - strcpy(cp_src[22],"/usr/libdata"); - strcpy(cp_src[23],"/usr/libexec"); - strcpy(cp_src[24],"/usr/obj"); - strcpy(cp_src[25],"/usr/sbin"); - strcpy(cp_src[26],"/usr/share"); - strcpy(cp_src[27],"/usr/src"); - strcpy(cp_src[28],""); + strcpy(cp_src[1],"/bin"); + strcpy(cp_src[2],"/boot"); + strcpy(cp_src[3],"/cdrom"); + strcpy(cp_src[4],"/dev"); + strcpy(cp_src[5],"/etc"); + strcpy(cp_src[6],"/root"); + strcpy(cp_src[7],"/sbin"); + strcpy(cp_src[8],"/sys"); + strcpy(cp_src[9],"/tmp"); + strcpy(cp_src[10],"/usr/Makefile"); + strcpy(cp_src[11],"/usr/bin"); + strcpy(cp_src[12],"/usr/games"); + strcpy(cp_src[13],"/usr/include"); + strcpy(cp_src[14],"/usr/lib"); + strcpy(cp_src[15],"/usr/libdata"); + strcpy(cp_src[16],"/usr/libexec"); + strcpy(cp_src[17],"/usr/local"); + strcpy(cp_src[18],"/usr/obj"); + strcpy(cp_src[19],"/usr/pkg"); + strcpy(cp_src[20],"/usr/sbin"); + strcpy(cp_src[21],"/usr/share"); + strcpy(cp_src[22],"/usr/src"); + strcpy(cp_src[23],"/var"); + strcpy(cp_src[24],""); } else { snprintf(file_path, 256, "%s%s", a->os_root, SOURCES_CONF_FILE); sources_conf = fopen(file_path, "r"); diff --git a/nrelease/installer/usr/local/share/dfuibe_installer/sources.conf b/nrelease/installer/usr/local/share/dfuibe_installer/sources.conf index dc7f943404..3f3c90fdf0 100644 --- a/nrelease/installer/usr/local/share/dfuibe_installer/sources.conf +++ b/nrelease/installer/usr/local/share/dfuibe_installer/sources.conf @@ -4,7 +4,6 @@ /cdrom /dev /etc -/lib /root /sbin /sys -- 2.41.0