Kaydet (Commit) e23be5ba authored tarafından Ali Rıza KESKİN's avatar Ali Rıza KESKİN

debug modu kernelden değil oluştururken ayarlıyoruz. (kernel debug olarak…

debug modu kernelden değil oluştururken ayarlıyoruz. (kernel debug olarak başlatmak sıkıntı olabilir.)

live modundaki buglar giderildi.

live modda zorla root ayarlama eklendi.
çeviri hataları giderildi.
üst 8d851a72
......@@ -51,3 +51,5 @@ No root device specified.::
Where is the root::
Setting root::
is not a block device::
Checking init::
Force setting root::
......@@ -45,7 +45,7 @@ Switching root::Kok degistiriliyor
Creating initrd::Initrd olusturuluyor
Mount handler running::Baglama islemleri calisiyor
UEFI mode detected::UEFI modu tespit edildi
Booting dead. Now you are in initial ramdisk.::Acilis nallari dikti. Simdi baslangıc ramdiski icindesin.
Booting dead. Now you are in initial ramdisk.::Acilis nallari dikti. Simdi baslangic ramdiski icindesin.
Detecting real root::Gercek kok tespit ediliyor
No root device specified.::Hicbir kok belirlenmedi.
Where is the root::Kok nerde amk
......@@ -53,4 +53,5 @@ Setting root::Kok ayarlaniyor
is not a block device::bir blok algit değil
Overlayfs disabled::Overlayfs kapali
Please wait. Reading rootfs...::Lütfen bekleyin. Rootfs okunuyor...
Checking init::Init kontrol ediliyor
Force setting root::Kok zorla ayarlaniyor
......@@ -5,4 +5,6 @@ if [ -f $CONFIG ] ; then
cat ${CONFIG} > ${WORKDIR}/etc/initrd.conf
else
echo "LANG=$LANG" > ${WORKDIR}/etc/initrd.conf
echo "debug=$debug" >> ${WORKDIR}/etc/initrd.conf
echo "nocolor=$nocolor" >> ${WORKDIR}/etc/initrd.conf
fi
......@@ -22,7 +22,7 @@ inf() {
}
debug() {
message=$(translate $1)
[ ! -n "$debug" ] || echo -e " ${C_BLUE}*${C_CLEAR} $message $2"
[ "$debug" != "true" ] || echo -e " ${C_BLUE}*${C_CLEAR} $message $2"
}
warn() {
message=$(translate $1)
......
......@@ -94,3 +94,4 @@ detect_root(){
export rootfstype
export init
}
......@@ -9,3 +9,4 @@ parse_cmdline
detect_root
run_modules
fallback_shell
......@@ -2,11 +2,11 @@
common_boot(){
debug "Moving mountpoints"
mount --move /sys /rootfs/sys
mount --move /proc /rootfs/proc
mount --move /dev /rootfs/dev
mount --move /tmp /rootfs/tmp
mount --move /run /rootfs/run
for i in sys proc dev tmp run
do
mkdir /rootfs/$i || true 2>/dev/null
mount --move /$i /rootfs/$i
done
}
overlay_mount(){
mkdir -p /root/a # upper
......@@ -37,17 +37,23 @@ overlay_mount(){
}
live_boot(){
[ "$sfs" == "" ] && sfs="/main.sfs"
list=$(ls /sys/class/block/ | grep ".*[0-9]$" | grep -v loop | grep -v ram | grep -v nbd | sed "s|^|/dev/|g")
for part in $list
do
debug "Looking for" "$part"
if is_file_avaiable "$part" "${sfs}"
then
debug "Detected live media" "$part"
export root=$part
fi
if [ "$root" == "" ] ; then
list=$(ls /sys/class/block/ | grep ".*[0-9]$" | grep -v loop | grep -v ram | grep -v nbd | sed "s|^|/dev/|g")
for part in $list
do
debug "Looking for" "$part"
if is_file_avaiable "$part" "${sfs}"
then
debug "Detected live media" "$part"
export root=$part
fi
done
else
msg "Force setting root" "$root"
fi
debug "Mounting live media"
mkdir /output
mkdir /source
mount -t auto $root /output
mount /output/${sfs} /source
overlay_mount
......@@ -92,15 +98,15 @@ classic_boot(){
}
if [ "$boot" == "live" ]; then
msg "Booting from live-media" "($root)"
live_boot || fallback_shell
msg "Booting from live-media" "($root)"
elif [ "$boot" == "normal" ]; then
msg "Booting from" "$root"
normal_boot || fallback_shell
msg "Booting from" "$root"
elif [ "$boot" == "freeze" ]; then
msg "Booting from" "$root (freeze)"
freeze_boot || fallback_shell
msg "Booting from" "$root (freeze)"
else
msg "Booting from" "$root (classic)"
classic_boot || fallback_shell
msg "Booting from" "$root (classic)"
fi
......@@ -14,6 +14,8 @@ if [ -f /rootfs/$subdir/etc/initrd.local ]; then
inf "Running local initrd scripts"
. /rootfs/$subdir/etc/initrd.local || true
fi
msg "Checking init"
[ -f "/rootfs/$subdir/$init" ] || fallback_shell
debug "Switching root"
exec env -i \
"TERM=$TERM" \
......
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