Kaydet (Commit) 8e7e5589 authored tarafından sulincix's avatar sulincix

new glibc fixes

üst 94fe2498
#!/bin/bash #!/bin/bash
[ ! -n "$KERNELVER" ] && KERNELVER=$(uname -r) [ ! -n "$KERNELVER" ] && KERNELVER=$(uname -r)
[ ! -n "$MODDIR" ] && MODDIR=/lib/modules/${KERNELVER} [ ! -n "$MODDIR" ] && MODDIR=/lib/modules/${KERNELVER}
[ ! -n "$OUTPUT" ] && OUTPUT=/boot/initrd.img-${KERNELVER}
[ -d $MODDIR ] || err "Module directory not found" "-> $MODDIR" [ -d $MODDIR ] || err "Module directory not found" "-> $MODDIR"
debug "Kernel Version" "${KERNELVER}" debug "Kernel Version" "${KERNELVER}"
......
bb=$(which busybox) bb=$(which busybox)
if [ -f "$bb" ] ; then if [ -f "$bb" ] ; then
if LANG="C" ldd $bb | grep "not a dynamic executable" >/dev/null ; then set +e
bbdyn=$(LANG="C" ldd $bb | grep "not a dynamic executable" 2>&1 )
if [ $? -ne 0 ] || [ "$bbdyn" != "" ] ; then
debug "Install busybox" "$bb" debug "Install busybox" "$bb"
install $bb $WORKDIR/busybox >/dev/null install $bb $WORKDIR/busybox >/dev/null
elif [ "$skipglibc" != "true" ] ; then elif [ "$skipglibc" != "true" ] ; then
...@@ -9,6 +11,7 @@ if [ -f "$bb" ] ; then ...@@ -9,6 +11,7 @@ if [ -f "$bb" ] ; then
else else
copy_binary busybox copy_binary busybox
fi fi
set -e
else else
err "Busybox not found" err "Busybox not found"
exit 1 exit 1
......
...@@ -18,7 +18,6 @@ get_module_with_dep(){ ...@@ -18,7 +18,6 @@ get_module_with_dep(){
parse_args(){ parse_args(){
export src=/lib/initrd/ export src=/lib/initrd/
export WORKDIR=$(mktemp) export WORKDIR=$(mktemp)
export OUTPUT=/boot/initrd.img-$(uname -r)
export nocolor=false export nocolor=false
export keepworkdir=false export keepworkdir=false
export skipglibc=false export skipglibc=false
......
...@@ -54,6 +54,9 @@ live_config(){ ...@@ -54,6 +54,9 @@ live_config(){
export LANG=${live_locale} export LANG=${live_locale}
export LC_ALL=${live_locale} export LC_ALL=${live_locale}
fi fi
if [ "${live_keymap}" != "" ] ; then
echo -e "keymap=\"${live_keymap}\"" > /rootfs/$subdir/etc/conf.d/keymaps
fi
else else
warn "Live config cannot works without openrc" warn "Live config cannot works without openrc"
fi fi
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment