12-01-2010
Good to know!
Would changing the filesystem change anything? It doesn't matter which I'm using I just had my Stick formatted in FAT32 and leaved it like that...
As said before I will try your suggestions friday, I don't have access to the system until then, sorry!
9 More Discussions You Might Find Interesting
1. Linux
Hi all
I have a usb external drive with two partitions sdb1 ntfs and sdb2 ext3 with label Linux
I copied a knoppix live distro in the second partition, then I installed grub on the drive. Now in the directory /media/sdb2/boot/grub i have the file device.map with the following content:
(hd0) ... (4 Replies)
Discussion started by: guast
4 Replies
2. UNIX for Dummies Questions & Answers
Alright. Here we go...
The other day, I was referred to this neat little command-line Unix simulator called Cygwin. To put it lightly, I fell in love. I found Knoppix, and from what I can tell, it's a viable OS once I strip off the KDE desktop environment to make it 'old-school'. I'm... (2 Replies)
Discussion started by: dev_squid
2 Replies
3. UNIX for Dummies Questions & Answers
Is there an easy way to setup a cross-over cable (USB-USB) between a linux box and a windows PC? My 2 machines are next to each other but I really do not want to keep transfering my files using my USB drive.
Thanks! (4 Replies)
Discussion started by: Xterra
4 Replies
4. Red Hat
im using Dell Inspiron with windows 7 as operating system.....in my hard drive there is some 34 gb unpartitioned space and now i want to install fedora 13 into it, after installation it should be dual boot.
problem here is...
i have the fedora 13 image file ie fedora13-i386-DVD.iso file.
... (13 Replies)
Discussion started by: karthik437
13 Replies
5. UNIX for Dummies Questions & Answers
I have 2 computers, from now on i shall call these computers A and B.
Made a live linux distro (bodhi) on A which has 1GB internal memory , because windows is unstable on B, which has 512MB internal memory.
I mean with memory the internal memory of the computer, not the memory of the usb... (0 Replies)
Discussion started by: anno
0 Replies
6. BSD
Hello. I'm going to make freebsd live usb based on FreeBSD-8.3-RELEASE-i386-livefs.iso. The iso is 257 Megabytes, but after i copy its content to usb drive its volume increases to 971 Megabytes. I tried different methods of copying (tar,cp,cpio) but with the same result. Could anyone help? (0 Replies)
Discussion started by: urello
0 Replies
7. Solaris
I am trying to create a live image of solaris 11.1.
I have used #pkg image-update to upgrade from 11 to 11.1 already. (since only 11.1 can make images of 11.1 due to using new grub)
then from within 11.1 I used pkg install install distribution-constructor
to get latest usbcopy that should be... (1 Reply)
Discussion started by: taltamir
1 Replies
8. Solaris
Hello All,
I am attempting to boot and install Solaris 11 via live USB on a HP DL580 Gen9 Server.
Unfortunately, when I do this it boots into System Maintenance Mode.
The attachment (Pic1) shows what I am seeing via the console.
The BIOS is in UEFI boot. Does not work on legacy mode as I... (15 Replies)
Discussion started by: Kerbi
15 Replies
9. What is on Your Mind?
Update: UserCP Screeching Frog 0.7641 - Changed Live Chat to Live Updates
In this version of the UserCP, I have changed "Live Chat" to "Live Updates" by disabling the ability to post in the "live chat" area and changed the name to "Live Updates"
The reason for this change is that experienced... (6 Replies)
Discussion started by: Neo
6 Replies
LEARN ABOUT DEBIAN
git-merge-index
GIT-MERGE-INDEX(1) Git Manual GIT-MERGE-INDEX(1)
NAME
git-merge-index - Run a merge for files needing merging
SYNOPSIS
git merge-index [-o] [-q] <merge-program> (-a | [--] <file>*)
DESCRIPTION
This looks up the <file>(s) in the index and, if there are any merge entries, passes the SHA1 hash for those files as arguments 1, 2, 3
(empty argument if no file), and <file> as argument 4. File modes for the three files are passed as arguments 5, 6 and 7.
OPTIONS
--
Do not interpret any more arguments as options.
-a
Run merge against all files in the index that need merging.
-o
Instead of stopping at the first failed merge, do all of them in one shot - continue with merging even when previous merges returned
errors, and only return the error code after all the merges.
-q
Do not complain about a failed merge program (a merge program failure usually indicates conflicts during the merge). This is for
porcelains which might want to emit custom messages.
If git merge-index is called with multiple <file>s (or -a) then it processes them in turn only stopping if merge returns a non-zero exit
code.
Typically this is run with a script calling git's imitation of the merge command from the RCS package.
A sample script called git merge-one-file is included in the distribution.
ALERT ALERT ALERT! The git "merge object order" is different from the RCS merge program merge object order. In the above ordering, the
original is first. But the argument order to the 3-way merge program merge is to have the original in the middle. Don't ask me why.
Examples:
torvalds@ppc970:~/merge-test> git merge-index cat MM
This is MM from the original tree. # original
This is modified MM in the branch A. # merge1
This is modified MM in the branch B. # merge2
This is modified MM in the branch B. # current contents
or
torvalds@ppc970:~/merge-test> git merge-index cat AA MM
cat: : No such file or directory
This is added AA in the branch A.
This is added AA in the branch B.
This is added AA in the branch B.
fatal: merge program failed
where the latter example shows how git merge-index will stop trying to merge once anything has returned an error (i.e., cat returned an
error for the AA file, because it didn't exist in the original, and thus git merge-index didn't even try to merge the MM thing).
GIT
Part of the git(1) suite
Git 1.7.10.4 11/24/2012 GIT-MERGE-INDEX(1)