Date: Mon, 10 Oct 2005 10:05:04 GMT From: soc-andrew <soc-andrew@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 85079 for review Message-ID: <200510101005.j9AA54wi094727@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=85079 Change 85079 by soc-andrew@soc-andrew_serv on 2005/10/10 10:04:04 Allow the installation of the source dists. Get reboot working again Affected files ... .. //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/backend/lua/lib/target_system.lua#4 edit .. //depot/projects/soc2005/bsdinstaller/src/libexec/bsdinstaller/conf/FreeBSD.lua#2 edit .. //depot/projects/soc2005/bsdinstaller/src/release/bsdinstaller/bsdinstaller_shell.sh#6 edit Differences ... ==== //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/backend/lua/lib/target_system.lua#4 (text+ko) ==== @@ -407,13 +407,19 @@ end elseif App.conf.use_tar then add_copy_command = function(src, dest) + if (string.sub(src, 0, 1) == "s") then + dir = "src" + else + dir = src + end cmds:add{ cmdline = "${root}${TAR} " .. "-x -C ${root}${base}${dest} -f " .. - "${root}usr/${uname}/${src}/${src}.${dist_suffix}", + "${root}usr/${uname}/${dir}/${src}.${dist_suffix}", replacements = { base = base, src = src, + dir = dir, dest = dest, dist_suffix = App.conf.dist_suffix, uname = posix.uname("%r") ==== //depot/projects/soc2005/bsdinstaller/src/libexec/bsdinstaller/conf/FreeBSD.lua#2 (text+ko) ==== @@ -24,7 +24,27 @@ { src = "compat21", dest = "/" }, { src = "compat22", dest = "/" }, { src = "compat3x", dest = "/" }, - { src = "compat4x", dest = "/" } + { src = "compat4x", dest = "/" }, + { src = "sbase", dest = "/usr/src" }, + { src = "scrypto", dest = "/usr/src" }, + { src = "setc", dest = "/usr/src" }, + { src = "sgames", dest = "/usr/src" }, + { src = "sbin", dest = "/usr/src" }, + { src = "scontrib", dest = "/usr/src" }, + { src = "skrb5", dest = "/usr/src" }, + { src = "slib", dest = "/usr/src" }, + { src = "slibexec", dest = "/usr/src" }, + { src = "sgnu", dest = "/usr/src" }, + { src = "sinclude", dest = "/usr/src" }, + { src = "ssbin", dest = "/usr/src" }, + { src = "ssecure", dest = "/usr/src" }, + { src = "sshare", dest = "/usr/src" }, + { src = "srelease", dest = "/usr/src" }, + { src = "srescue", dest = "/usr/src" }, + { src = "subin", dest = "/usr/src" }, + { src = "susbin", dest = "/usr/src" }, + { src = "ssys", dest = "/usr/src" }, + { src = "stools", dest = "/usr/src" } } cmd_names = cmd_names + { ==== //depot/projects/soc2005/bsdinstaller/src/release/bsdinstaller/bsdinstaller_shell.sh#6 (text+ko) ==== @@ -13,7 +13,7 @@ /usr/sbin/bsd_installer_ncurses elif [ ${TTY} = "/dev/ttyv1" ] then - LUA_PATH="/usr/lib/lua/?.lua;/usr/libexec/bsdinstaller/lib/?.lua" LUA_CPATH=/usr/lib/lua/?.so LUA_SOPATH=/usr/lib/lua/ bsd_lua -lcompat-5.1 /usr/libexec/bsdinstaller/main.lua /usr/libexec/bsdinstaller/conf/BSDInstaller.lua /usr/libexec/bsdinstaller/conf/FreeBSD.lua dir.root=/ booted_from_install_media=true 2>&1 | tee /var/log/bsd_installer.log + LUA_PATH="/usr/lib/lua/?.lua;/usr/libexec/bsdinstaller/lib/?.lua" LUA_CPATH=/usr/lib/lua/?.so LUA_SOPATH=/usr/lib/lua/ bsd_lua -lcompat-5.1 /usr/libexec/bsdinstaller/main.lua /usr/libexec/bsdinstaller/conf/BSDInstaller.lua /usr/libexec/bsdinstaller/conf/FreeBSD.lua dir.root=/ booted_from_install_media=true #/usr/sbin/bsd_installer_be if [ $? -eq 5 ] then
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200510101005.j9AA54wi094727>